Merge with 3.5

diff --cc Lib/idlelib/NEWS.txt
index 22a5184e3a899518a1ca7ea00a7ca877cb402cfd,18761e9c946a5625ae792dbb143cadf1a1e939d3..ea5300e45d9ca81e6c8a337af3208b765f6bc1f5
--- 1/Lib/idlelib/NEWS.txt
--- 2/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@@ -1,7 -1,10 +1,10 @@@
 -What's New in IDLE 3.5.1?
 -=========================
 -*Release date: 2015-09-13*
 +What's New in IDLE 3.6.0a1?
 +===========================
 +*Release date: 2017?*
  
+ - Issue #24861: Most of idlelib is private and subject to change.
+   Use idleib.idle.* to start Idle. See idlelib.__init__.__doc__.   
+ 
  - Issue #25199: Idle: add synchronization comments for future maintainers.
  
  - Issue #16893: Replace help.txt with idle.html for Idle doc display.

diff --cc Misc/NEWS
Simple merge