changes for Django 1.7