fix django 1.7 issues related to #255