Django 1.7 upgrade