Fix for deprecation warning in django 1.7rc2
Merge branch 'johnturner-master' into django_1.7