Update for Django 1.5