Fix column name in migration
Merge branch 'permissions-by-record-type'