Upgraded to Django 1.6