Merge #23722 from 3.6

diff --cc Misc/NEWS
index d9b7ed65bd3a705b62306c173cc079a6fc276570,e97cd6e657778a7b8de507b88aa87d069ee21103..12021f6abaf43c38795a3da731729acaa9b2975b
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -25,13 -23,39 +30,21 @@@ Core and Builtin
    if the next instruction is YIELD_FROM. Regression introduced by WORDCODE
    (issue #26647).
  
 -Library
 --------
 -
 -- Issue #27172: To assist with upgrades from 2.7, the previously documented
 -  deprecation of ``inspect.getfullargspec()`` has been reversed. This decision
 -  may be revisited again after the Python 2.7 branch is no longer officially
 -  supported.
 -
 -- Issue #24142: Reading a corrupt config file left configparser in an
 -  invalid state.  Original patch by Florian Höch.
 -
 -- Issue #28843: Fix asyncio C Task to handle exceptions __traceback__.
 +- Issue #28774: Fix error position of the unicode error in ASCII and Latin1
 +  encoders when a string returned by the error handler contains multiple
 +  non-encodable characters (non-ASCII for the ASCII codec, characters out
 +  of the U+0000-U+00FF range for Latin1).
  
 -- Issue #23722: The data model reference and the porting section in the What's
 -  New guide now cover the additional ``__classcell__`` handling needed for
 -  custom metaclasses to fully support PEP 487 and zero-argument ``super()``.
 -
 -Tools/Demos
 ------------
 -
 -- Issue #28023: Fix python-gdb.py didn't support new dict implementation.
 -
+ Documentation
+ -------------
+ 
 -What's New in Python 3.6.0 beta 4
 -=================================
 -
 -*Release date: 2016-11-21*
 -
 -Core and Builtins
 ------------------
++- Issue #23722: The data model reference and the porting section in the
++  3.6 What's New guide now cover the additional ``__classcell__`` handling
++  needed for custom metaclasses to fully support PEP 487 and zero-argument
++  ``super()``.
+ 
 +- Issue #28731: Optimize _PyDict_NewPresized() to create correct size dict.
 +  Improve speed of dict literal with constant keys up to 30%.
  
  - Issue #28532: Show sys.version when -V option is supplied twice.
  

diff --cc Objects/typeobject.c
Simple merge

diff --cc Python/bltinmodule.c
Simple merge

diff --cc Python/compile.c
Simple merge