Update for Django 1.6.x compatibility