A backport of the timezone validation stuff to 2.8

see above