WIP: towards django 1.5