Issue #24808: Merge 3.5 into 3.6

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
index 625e7e6e0e76a473a1b00e30f35269033a4129c4,0d7ae1d44caba1414ef6b4af7cb21a305b2196d9..e12494c03d744883768a17f122a89a30c530210e
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -129,12 -149,6 +129,15 @@@ IDL
  Documentation
  -------------
  
++- Issue #24808: Update the types of some PyTypeObject fields. Patch by
++  Joseph Weston.
++
 +- Issue #22812: Fix unittest discovery examples.
 +  Patch from Pam McA'Nulty.
 +
 +- Issue #23725: Overhaul tempfile docs. Note deprecated status of mktemp.
 +  Patch from Zbigniew Jędrzejewski-Szmek.
 +
  - Issue #24129: Clarify the reference documentation for name resolution.
    This includes removing the assumption that readers will be familiar with the
    name resolution scheme Python used prior to the introduction of lexical