Migration merge issues
Merge pull request #940 from ahinz/fix/migrations

Migration merge issues