Removed migration script in master
Merge branch 'master' into remove_mimetype_decisions

Conflicts:
	migrate.py