Issue #27587: Merge from 3.5

diff --cc Misc/NEWS
index cbbb4242e4941d55a1605cb8a87f4780866a5d72,730ed96e61bbf90747263a313a2a0013701502fa..c2265d6b48e09749ea195c189e74095086f10fcd
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,20 -10,10 +10,24 @@@ What's New in Python 3.6.0 beta 
  Core and Builtins
  -----------------
  
+ - Issue #27587: Fix another issue found by PVS-Studio: Null pointer check
+   after use of 'def' in _PyState_AddModule().
+   Initial patch by Christian Heimes.
+ 
 +- Issue #27792: The modulo operation applied to ``bool`` and other
 +  ``int`` subclasses now always returns an ``int``. Previously
 +  the return type depended on the input values. Patch by Xiang Zhang.
 +
 +- Issue #26984: int() now always returns an instance of exact int.
 +
 +- Issue #25604: Fix a minor bug in integer true division; this bug could
 +  potentially have caused off-by-one-ulp results on platforms with
 +  unreliable ldexp implementations.
 +
 +- Issue #27662: Fix an overflow check in ``List_New``: the original code was
 +  checking against ``Py_SIZE_MAX`` instead of the correct upper bound of
 +  ``Py_SSIZE_T_MAX``. Patch by Xiang Zhang.
 +
  - Issue #27782: Multi-phase extension module import now correctly allows the
    ``m_methods`` field to be used to add module level functions to instances
    of non-module types returned from ``Py_create_mod``. Patch by Xiang Zhang.

diff --cc Python/pystate.c
Simple merge