merge from 3.4

diff --cc Doc/README.txt
index f4f6d81bc9adb437d1822008728fdfd855557da1,8e0241096b458a8d0fb1ca7fb16d076d4c0c919b..cb57e617e5d82dc87bef5b258f9a274a11f0d267
--- 1/Doc/README.txt
--- 2/Doc/README.txt
+++ b/Doc/README.txt
@@@ -3,7 -3,7 +3,7 @@@ Python Documentation READM
  
  This directory contains the reStructuredText (reST) sources to the Python
  documentation.  You don't need to build them yourself, prebuilt versions are
- available at <http://docs.python.org/download/>.
 -available at <https://docs.python.org/3.4/download.html>.
++available at <https://docs.python.org/dev/download.html>.
  
  Documentation on the authoring Python documentation, including information about
  both style and markup, is available in the "Documenting Python" chapter of the