Upgraded for Django 1.6