improved django 1.5 compat
Merge remote-tracking branch 'origin/five' into five