Ignore blank timezones, complements 9ad5ea2c65

If a user or site has a timezone as an empty string, for example, it should
be ignored.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/controllers/application_controller.rb