support for django-1.7
Merge branch 'django1.7'