Port to Django 1.5