Merge from 3.5.

diff --cc Misc/NEWS
index 17e42bdd2d9ae641fd5907a0f5423749121849f4,96e13feba347b9524dc487cfc617a32ea3600b38..9e3ae25fa50f6a10efd1f3fc061ab0594d1c3b0b
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -2,98 -2,9 +2,98 @@@
  Python News
  +++++++++++
  
 +What's New in Python 3.6.0 alpha 1?
 +===================================
 +
 +Release date: XXXX-XX-XX
 +
 +Core and Builtins
 +-----------------
 +
 +- 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.
 +
 +Library
 +-------
 +
 +- Issue #22241: timezone.utc name is now plain 'UTC', not 'UTC-00:00'.
 +
 +- Issue #23517: fromtimestamp() and utcfromtimestamp() methods of
 +  datetime.datetime now round microseconds to nearest with ties going to
 +  nearest even integer (ROUND_HALF_EVEN), as round(float), instead of rounding
 +  towards -Infinity (ROUND_FLOOR).
 +
 +- Issue #23552: Timeit now warns when there is substantial (4x) variance
 +  between best and worst times. Patch from Serhiy Storchaka.
 +
 +- Issue #24633: site-packages/README -> README.txt.
 +
 +- Issue #24879:  help() and pydoc can now list named tuple fields in the
 +  order they were defined rather than alphabetically.  The ordering is
 +  determined by the _fields attribute if present.
 +
 +- Issue #24874:  Improve speed of itertools.cycle() and make its
 +  pickle more compact.
 +
 +- Fix crash in itertools.cycle.__setstate__() when the first argument wasn't
 +  a list.
 +
 +- Issue #20059: urllib.parse raises ValueError on all invalid ports.
 +  Patch by Martin Panter.
 +
 +- Issue #24360: Improve __repr__ of argparse.Namespace() for invalid
 +  identifiers.  Patch by Matthias Bussonnier.
 +
 +- Issue #23426: run_setup was broken in distutils.
 +  Patch from Alexander Belopolsky.
 +
 +- Issue #13938: 2to3 converts StringTypes to a tuple. Patch from Mark Hammond.
 +
 +- Issue #2091: open() accepted a 'U' mode string containing '+', but 'U' can
 +  only be used with 'r'. Patch from Jeff Balogh and John O'Connor.
 +
 +- Issue #8585: improved tests for zipimporter2. Patch from Mark Lawrence.
 +
 +- Issue #18622: unittest.mock.mock_open().reset_mock would recurse infinitely.
 +  Patch from Nicola Palumbo and Laurent De Buyst.
 +
 +- Issue #24426: Fast searching optimization in regular expressions now works
 +  for patterns that starts with capturing groups.  Fast searching optimization
 +  now can't be disabled at compile time.
 +
 +- Issue #23661: unittest.mock side_effects can now be exceptions again. This
 +  was a regression vs Python 3.4. Patch from Ignacio Rossi
 +
 +- Issue #13248: Remove deprecated inspect.getargspec and inspect.getmoduleinfo
 +  functions.
 +
 +Documentation
 +-------------
 +
 +- Issue #24952: Clarify the default size argument of stack_size() in
 +  the "threading" and "_thread" modules. Patch from Mattip.
 +
 +Tests
 +-----
 +
 +- PCbuild\rt.bat now accepts an unlimited number of arguments to pass along
 +  to regrtest.py.  Previously there was a limit of 9.
 +
 +Build
 +-----
 +
 +- Issue #24986: It is now possible to build Python on Windows without errors
 +  when external libraries are not available.
 +
 +Windows
 +-------
 +
 +- Issue #25022: Removed very outdated PC/example_nt/ directory.
 +
  
- What's New in Python 3.5.1
- ==========================
+ What's New in Python 3.5.1 release candidate 1?
+ ===============================================
  
  Release date: TBA
  
@@@ -194,6 -104,6 +194,7 @@@ Window
  
  - Issue #25022: Removed very outdated PC/example_nt/ directory.
  
++
  What's New in Python 3.5.0 final?
  =================================
  

diff --cc README
index f232755601aa91ea6c531c3782878eba9d94d916,d37b96b316099c8e0d6351704b1b83f92df0643f..db0b093d120706a985028040ff1df6c0e2675067
--- 1/README
--- 2/README
+++ b/README
@@@ -49,14 -50,14 +50,14 @@@ You should do a "make clean" at the top
  What's New
  ----------
  
- We try to have a comprehensive overview of the changes in the "What's New in
+ We have a comprehensive overview of the changes in the "What's New in
 -Python 3.5" document, found at
 +Python 3.6" document, found at
  
 -    http://docs.python.org/3.5/whatsnew/3.5.html
 +    http://docs.python.org/3.6/whatsnew/3.6.html
  
- For a more detailed change log, read Misc/NEWS (though this file, too, is
- incomplete, and also doesn't list anything merged in from the 2.7 release under
- development).
+ For a more detailed change log, read Misc/NEWS (though this file, too,
+ is incomplete, and also doesn't list anything merged in from the 2.7
+ release under development).
  
  If you want to install multiple versions of Python see the section below
  entitled "Installing multiple versions".