Even more updates to deal with the doctest module, including the forward port of c111722 from the 2.12 branch