port to django 1.4 - phase #1