Issue #26930: Merge with 3.5

diff --cc Misc/NEWS
index 9825e0900715fc54c1c0215e17e68848c6cc7fc1,fe847b466fb107c230b1be1c66e2a8dfb2636281..9f79a6f6d2d6d53b73f60cb79328d4d452169356
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -39,28 -36,24 +39,30 @@@ Librar
    locale encoding, and fix get_begidx() and get_endidx() to return code point
    indexes.
  
 -- Issue #26930: Update Windows builds to use OpenSSL 1.0.2h.
 +IDLE
 +----
  
 -What's New in Python 3.5.2 final?
 -=================================
 +- Issue #27310: Fix IDLE.app failure to launch on OS X due to vestigial import.
  
 -Release date: 2016-06-26
 +Build
 +-----
  
 -Core and Builtins
 ------------------
++- Issue #26930: Update Windows builds to use OpenSSL 1.0.2h.
+ 
 -Library
 --------
 +- Issue #23968: Rename the platform directory from plat-$(MACHDEP) to
 +  plat-$(PLATFORM_TRIPLET).
 +  Rename the config directory (LIBPL) from config-$(LDVERSION) to
 +  config-$(LDVERSION)-$(PLATFORM_TRIPLET).
 +  Install the platform specifc _sysconfigdata module into the platform
 +  directory and rename it to include the ABIFLAGS.
  
 +- Don't use largefile support for GNU/Hurd.
  
 -What's New in Python 3.5.2 release candidate 1?
 -===============================================
  
 -Release date: 2016-06-12
 +What's New in Python 3.6.0 alpha 2
 +==================================
 +
 +*Release date: 2016-06-13*
  
  Core and Builtins
  -----------------

diff --cc PCbuild/readme.txt
Simple merge