Update for Django 1.7