restore accidentally deleted migration. ack
Merge branch 'master' into release