Fix the Django 1.6 fix