Made compatible with django 1.6