fixing a timezone-aware issue in one migration
Merge branch 'master' into postgresdb