Update for Django 1.6