merge 3.6

diff --cc README
index 1b899b2469e7309c0890e55c8b4be7fae5fbbd97,4fc97e6013063e2012ffeb76a3a6637262ec3335..bd2735da87a520e1d73fe7da1dbc1b9fcf2598ab
--- 1/README
--- 2/README
+++ b/README
@@@ -1,8 -1,9 +1,9 @@@
 -This is Python version 3.6.1 release candidate 1
 -================================================
 +This is Python version 3.7.0 alpha 1
 +====================================
  
  Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
- 2012, 2013, 2014, 2015, 2016 Python Software Foundation.  All rights reserved.
+ 2012, 2013, 2014, 2015, 2016, 2017 Python Software Foundation.  All rights
+ reserved.
  
  Python 3.x is a new version of the language, which is incompatible with the
  2.x line of releases.  The language is mostly the same, but many details,