Issue #17398: document url argument of RobotFileParser
Merge with 3.2
#17431: Fix missing import of BytesFeedParser in email.parser.

Initial patch contributed by Edmond Burnett.
Merge: #17431: Fix missing import of BytesFeedParser in email.parser.
Issue # 10652: make tcl/tk tests run after __all__ test, patch by Zachary Ware.
Issue # 10652: make tcl/tk tests run after __all__ test, patch by Zachary Ware.
typo
#12345: null merge with 3.2.
Remove row-spanning cell, which the Sphinx text writer does not support.
merge heads