yet another fix for the timezone hell
Merge branch 'master' into logan