timezone code better handles empty string
Merge remote-tracking branch 'upstream/master'