Issue #25827: Merge with 3.5

diff --cc Makefile.pre.in
Simple merge

diff --cc Misc/NEWS
index ff1beefaf9283d2bd51354478d0882d64666e74d,ef37f5f000d6d26a76153091806cfcec8eb853df..0d9c7dd3a5a110aa6d8412577e605304749edf21
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -509,26 -92,13 +509,29 @@@ Test
  Build
  -----
  
+ - Issue #25827: Add support for building with ICC to ``configure``, including
+   a new ``--with-icc`` flag.
+ 
  - Issue #25696: Fix installation of Python on UNIX with make -j9.
  
 +- Issue #24986: It is now possible to build Python on Windows without errors
 +  when external libraries are not available.
 +
  - Issue #25798: Update OS X 10.5 installer to use OpenSSL 1.0.2e.
  
 +Windows
 +-------
 +
 +- Issue #25022: Removed very outdated PC/example_nt/ directory.
 +
 +Tools/Demos
 +-----------
 +
 +- Issue #25440: Fix output of python-config --extension-suffix.
 +
 +- Issue #25154: The pyvenv script has been deprecated in favour of
 +  `python3 -m venv`.
 +
  
  What's New in Python 3.5.1 final?
  =================================

diff --cc configure
Simple merge

diff --cc configure.ac
Simple merge