Merge with 3.4

diff --cc Misc/NEWS
index 24f5e52e86984ba6fb36fdfdcf05019c8afcc19c,57b75a5c4a7123442ae7465dbc55607a9bb7d663..e44af483924eda56664923dcd9654c296c3335ec
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -450,10 -360,6 +450,15 @@@ Extension Module
  IDLE
  ----
  
++- Issue #18409: Add unittest for AutoComplete. Patch by Phil Webster.
++
++- Issue #21477: htest.py - Improve framework, complete set of tests.
++  Patches by Saimadhav Heblikar
++
 +- Issue #18104: Add idlelib/idle_test/htest.py with a few sample tests to begin
 +  consolidating and improving human-validated tests of Idle. Change other files
 +  as needed to work with htest.  Running the module as __main__ runs all tests.
 +
  - Issue #21139: Change default paragraph width to 72, the PEP 8 recommendation.
  
  - Issue #21284: Paragraph reformat test passes after user changes reformat width.