Updated for django 1.7