Shunted code to Django 1.5.4