tweaked message code for invalid time zone
Merge remote-tracking branch 'origin/master'