excluded docs
django 1.5 compatibility :)
Merge remote-tracking branch 'origin/five' into five