Properly migrate database.
Properly migrate database.
Merge branch 'travis'