Fix makemigration for django 1.6-
Merge pull request #3523 from yakky/feature/fix_develop_migrations

Fix makemigration for django 1.6-