Updates for django 1.5 compatibility.