Merged migrations
Merge pull request #706 from stefk/merge-migrations

Merged migrations