Merge 3.5

diff --cc Misc/NEWS
index f4dd64c5647b8cb6729958548aad2e9c2834520e,e132b968ca3c263b9cdcc7825ba26f39bda55616..bf7b8f10ffe30c566cecf7094b05b24912c7ae66
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -477,22 -124,9 +477,22 @@@ Core and Builtin
  - Issue #25843: When compiling code, don't merge constants if they are equal
    but have a different types. For example, ``f1, f2 = lambda: 1, lambda: 1.0``
    is now correctly compiled to two different functions: ``f1()`` returns ``1``
-   (``int``) and ``f2()`` returns ``1.0`` (``int``), even if ``1`` and ``1.0``
+   (``int``) and ``f2()`` returns ``1.0`` (``float``), even if ``1`` and ``1.0``
    are equal.
  
 +- Issue #26107: The format of the ``co_lnotab`` attribute of code objects
 +  changes to support negative line number delta.
 +
 +- Issue #26154: Add a new private _PyThreadState_UncheckedGet() function to get
 +  the current Python thread state, but don't issue a fatal error if it is NULL.
 +  This new function must be used instead of accessing directly the
 +  _PyThreadState_Current variable.  The variable is no more exposed since
 +  Python 3.5.1 to hide the exact implementation of atomic C types, to avoid
 +  compiler issues.
 +
 +- Issue #25791: If __package__ != __spec__.parent or if neither __package__ or
 +  __spec__ are defined then ImportWarning is raised.
 +
  - Issue #22995: [UPDATE] Comment out the one of the pickleability tests in
    _PyObject_GetState() due to regressions observed in Cython-based projects.