fix migrations
remove comment
Merge branch 'master' into migrate_to_postgresql