Merge migrations
Merge pull request #347 from quamilek/merge-migrations

Merge migrations