Updated to Django 1.6