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