Fix makemigration for django 1.6-
Merge pull request #3522 from yakky/feature/fix_develop_migrations_30

Fix makemigration for django 1.6-