Patch #639112: fixes for None locale and tz.
2 files changed