Merge: #21167: Fix definition of NAN when ICC used without -fp-model strict.

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
index 7a5c87ac944e85673d6a1daf0b71f7e28c406a6a,0376c4c8fcd92231ea3efe7b914e9a5151b768d1..a8bc4536bd1b3d6a27a9cf2e99bf514eae352fba
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,9 -10,29 +10,12 @@@ Release date: XXXX-XX-X
  Core and Builtins
  -----------------
  
 -Library
 --------
 -
 -- Issue #24847: Fixes tcltk installer layout of VC runtime DLL
 -
 -- Issue #24839: platform._syscmd_ver raises DeprecationWarning
 -
 -Documentation
 --------------
 -
 -- Issue #23725: Overhaul tempfile docs. Note deprecated status of mktemp.
 -  Patch from Zbigniew Jędrzejewski-Szmek.
 -
 -What's New in Python 3.5.0 release candidate 1?
 -===============================================
 -
 -Release date: 2015-08-09
 -
 -Core and Builtins
 ------------------
+ - Issue #21167: NAN operations are now handled correctly when python is
+   compiled with ICC even if -fp-model strict is not specified.
+ 
 +- Issue #9232: Modify Python's grammar to allow trailing commas in the
 +  argument list of a function declaration.  For example, "def f(*, a =
 +  3,): pass" is now legal. Patch from Mark Dickinson.
  
  - Issue #24667: Resize odict in all cases that the underlying dict resizes.