The rest of django 1.5 compatibility