Merge with ongoing work in 3.5 branch.

diff --cc Misc/NEWS
index 7bbc0374866e1b51cdff53e954ce19ea5879d987,46881c334fb8ee316af4af69d8590059a61fe35f..2bd6bcb84e4a2a58cb5448f542f35c10d33a7363
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,6 -10,8 +10,10 @@@ Release date: 2015-07-2
  Core and Builtins
  -----------------
  
+ - Issue #24569: Make PEP 448 dictionary evaluation more consistent.
+ 
++- Issue #24407: Fix crash when dict is mutated while being updated.
++
  Library
  -------