Merged in migrations into master