Merged migrations
Merge pull request #712 from stefk/migration-merge

Merged migrations