Updated for django 1.6