#13899: \A, \Z, and \B now correctly match the A, Z, and B literals when used inside character classes (e.g. [A]).  Patch by Matthew Barnett.
Issue #16874: fix formatting of setup.py upload options in documentation.
#16154: fix some doctests in Doc/library.  Patch by Ravi Sinha.
Merge heads.