Null merge from 3.5.

diff --cc Misc/NEWS
index d235f649487ee1de85537686d110cd0debb2f8bd,7e5f9d0e9ee782e146741c6b1642b13bca4fa7f5..67cd7bbe16d7aa861764b5e739c3a039498555f4
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -2,10 -2,10 +2,10 @@@
  Python News
  +++++++++++
  
 -What's New in Python 3.5.2 release candidate 1?
 -===============================================
 +What's New in Python 3.6.0 alpha 1?
 +===================================
  
- Release date: XXXX-XX-XX
+ Release date: tba
  
  Core and Builtins
  -----------------