Updated to Django 1.5