Upgrade to Django 1.6