Merge 3.5, fix for #24142

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

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
index 929ce5322b26195ec80d72c2547415a88cd89e5c,3b8ca5e68b813a56c0ecf7739c9105732790edf5..c950383ce5c1b253e3f1ea25d425c6e89769916c
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -2,31 -2,10 +2,34 @@@
  Python News
  +++++++++++
  
 -What's New in Python 3.5.3 release candidate 1?
 -===============================================
 +What's New in Python 3.6.0 release candidate 1
 +==============================================
 +
 +*Release date: XXXX-XX-XX*
 +
 +Core and Builtins
 +-----------------
 +
 +- Issue #28782: Fix a bug in the implementation ``yield from`` when checking
 +  if the next instruction is YIELD_FROM. Regression introduced by WORDCODE
 +  (issue #26647).
 +
 +Library
 +-------
 +
++- Issue #24142: Reading a corrupt config file left configparser in an
++  invalid state.  Original patch by Florian Höch.
++
 +Tools/Demos
 +-----------
 +
 +- Issue #28023: Fix python-gdb.py didn't support new dict implementation.
 +
  
 -Release date: TBA
 +What's New in Python 3.6.0 beta 4
 +=================================
 +
 +*Release date: 2016-11-21*
  
  Core and Builtins
  -----------------