Merge with 3.2 #964437

diff --cc Misc/NEWS
index d1f5cb3ec6afabef572dc507e7bbf5a8efce80ff,0a12d215246da1d543ee25dbc304abb66337ddd4..244c813b7315a3139cc0a2c879a883767862fb92
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -466,15 -113,11 +466,18 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #964437 Make IDLE help window non-modal.
+   Patch by Guilherme Polo and Roger Serwy.
+ 
 +- Issue #13734: Add os.fwalk(), a directory walking function yielding file
 +  descriptors.
 +
  - Issue #2945: Make the distutils upload command aware of bdist_rpm products.
  
 +- Issue #13712: pysetup create should not convert package_data to extra_files.
 +
 +- Issue #11805: package_data in setup.cfg should allow more than one value.
 +
  - Issue #13933: IDLE auto-complete did not work with some imported
    module, like hashlib.  (Patch by Roger Serwy)