Fixed everything for Django 1.6-