Adding support for django > 1.6