Changing to Django 1.6