django 1.7 fixes