upgrade for django-1.6