updated for django 1.7