Changes for django 1.5