Catch exception caused by invalid timezone such as "Eastern Standard Time" and fall back to UTC.
Merge branch 'mariadb-master' into pr8

Conflicts:
	docs/ChangeLog
add test for invalid timezone
Merge branch 'pr8'