Update for django-1.5