updates for Django 1.7