added django 1.6 compatibility