merge 3.3

diff --cc Doc/license.rst
index 32c172e7d7caf70283d3f073b4a3b3ff4ff2c143,492b80f8ed16de79e9e4de96b2dc985b0ea75c71..53a1c4d57ec499736473cd87ae4264263110e5a6
--- 1/Doc/license.rst
--- 2/Doc/license.rst
+++ b/Doc/license.rst
@@@ -84,9 -84,9 +84,9 @@@ Terms and conditions for accessing or o
     analyze, test, perform and/or display publicly, prepare derivative works,
     distribute, and otherwise use Python |release| alone or in any derivative
     version, provided, however, that PSF's License Agreement and PSF's notice of
-    copyright, i.e., "Copyright © 2001-2014 Python Software Foundation; All
 -   copyright, i.e., "Copyright © 2001-2015 Python Software Foundation; All Rights
 -   Reserved" are retained in Python |release| alone or in any derivative version
 -   prepared by Licensee.
++   copyright, i.e., "Copyright © 2001-2015 Python Software Foundation; All
 +   Rights Reserved" are retained in Python |release| alone or in any derivative
 +   version prepared by Licensee.
  
  #. In the event Licensee prepares a derivative work that is based on or
     incorporates Python |release| or any part thereof, and wants to make the

diff --cc README
Simple merge