#1291 http.server's send_error takes an optional explain argument
Issue #17398: document url argument of RobotFileParser
Merge with 3.2
Merge with 3.3
#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.
Merge: #17431: Fix missing import of BytesFeedParser in email.parser.
Add missing FeedParser and BytesFeedParser to email.parser.__all__.
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.
Merge with 3.3
typo
#12345: null merge with 3.2.
#10652 null merge from 3.3 which had wrong issue #
Remove row-spanning cell, which the Sphinx text writer does not support.
merge heads
merge with 3.3