Feature/django 1.4 compat