sync to django 1.7