Update for Django 1.4