changes according to django 1.6.5