Updates for Django 1.6