Now works on django-1.7 and django-1.6