merge 3.5

diff --cc README
index d682a2bdd31006accd1e5f558d76cd1d6c005c6a,2335889b3ab898b678c06fce6d8e5bb69037c8fb..7afdbf829c7005688bfe9ad5bdc8dfc4778a51a5
--- 1/README
--- 2/README
+++ b/README
@@@ -1,8 -1,8 +1,8 @@@
 -This is Python version 3.5.1
 -============================
 +This is Python version 3.6.0 alpha 1
 +====================================
  
  Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
- 2012, 2013, 2014, 2015 Python Software Foundation.  All rights reserved.
+ 2012, 2013, 2014, 2015, 2016 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,