Issue #17711: Fixed unpickling by the persistent ID with protocol 0.

Original patch by Alexandre Vassalotti.

diff --cc Lib/pickle.py
Simple merge

diff --cc Lib/test/pickletester.py
Simple merge

diff --cc Lib/test/test_pickle.py
Simple merge

diff --cc Misc/NEWS
index 2bd739088d6f2c965aeaa26b3de65ad923a19e3c,a79cfaf88a7b45da62f38de1fc501596e9eae191..848700ac0f723d061ad5a670aa5b6817d4ee3c73
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -15,29 -15,6 +15,32 @@@ Core and Builtin
  - Issue #27514: Make having too many statically nested blocks a SyntaxError
    instead of SystemError.
  
 +Library
 +-------
 +
++- Issue #17711: Fixed unpickling by the persistent ID with protocol 0.
++  Original patch by Alexandre Vassalotti.
++
 +- Issue #27522: Avoid an unintentional reference cycle in email.feedparser.
 +
 +- Issue 27512: Fix a segfault when os.fspath() called a an __fspath__() method
 +  that raised an exception. Patch by Xiang Zhang.
 +
 +Tests
 +-----
 +
 +- Issue #27369: In test_pyexpat, avoid testing an error message detail that
 +  changed in Expat 2.2.0.
 +
 +
 +What's New in Python 3.6.0 alpha 3
 +==================================
 +
 +*Release date: 2016-07-11*
 +
 +Core and Builtins
 +-----------------
 +
  - Issue #27473: Fixed possible integer overflow in bytes and bytearray
    concatenations.  Patch by Xiang Zhang.
  

diff --cc Modules/_pickle.c
Simple merge