#303 Code changes from reading through Django 1.7 Release Notes: https://docs.djangoproject.com/en/1.7/releases/1.7/#backwards-incompatible-changes-in-1-7