No more epydoc, part 2
Merge branch '1.11' into 1.12
Seriously, no more epydoc!
Merge branch '1.10' into 1.11
Merge branch '1.11' into 1.12