Update to Django 1.5 compat