#18856: improve test coverage of the calendar module.  Patch by Madison May.
Fix tkinter regression introduced by the security fix in #16248.
Merge heads.
Address Terry's comments
#18856: merge with 3.3.
Add __reversed__ to Enum.  Minor code reorg (moved __members__ to be in alpha order).
Close #18929: inspect.classify_class_attrs will now search the metaclasses (last) to find where an attr was defined.
Issue #19018: The heapq.merge() function no longer suppresses IndexError
merge
Fixup reST syntax errors and streamline docs of PEP 446.
Expose --bind argument for http.server, enable http.server to bind to a user
specified network interface.

Patch contributed by Malte Swart. Addresses issue #17764.

HG :Enter commit message.  Lines beginning with 'HG:' are removed.
Close #18989: enum members will no longer overwrite other attributes, nor be overwritten by them.
Null merge of 3.1 into 3.2

Changeset c39f42f46a05 left a dangling head on 3.1.
Null merge of 3.2 into 3.3.
Null merge of 3.3 into default.
Issue 18771: Make it possible to set the number linear probes at compile-time.