Merge "Proper handling of invalid/unknown time zones"