added django 1.4 compatibility