changes for django 1.6