Merge with 3.4

diff --cc Doc/README.txt
Simple merge

diff --cc Doc/distutils/apiref.rst
Simple merge

diff --cc Doc/glossary.rst
Simple merge

diff --cc Doc/howto/pyporting.rst
Simple merge

diff --cc Doc/library/datetime.rst
Simple merge

diff --cc Doc/library/functions.rst
Simple merge

diff --cc Doc/library/importlib.rst
Simple merge

diff --cc Doc/library/unittest.mock.rst
Simple merge

diff --cc Doc/library/unittest.rst
Simple merge

diff --cc Doc/reference/datamodel.rst
Simple merge

diff --cc Doc/tools/templates/indexsidebar.html
index 690c3d527745b9325dabefb66f344a26f15a1e1a,abdf070772c8f8b3bb4006e02cbfa5d72c0a48be..78e9c4f99ef076925bb9698e5bf2195a2c091803
--- 1/Doc/tools/templates/indexsidebar.html
--- 2/Doc/tools/templates/indexsidebar.html
+++ b/Doc/tools/templates/indexsidebar.html
@@@ -2,9 -2,10 +2,9 @@@
  <p><a href="{{ pathto('download') }}">Download these documents</a></p>
  <h3>Docs for other versions</h3>
  <ul>
-   <li><a href="http://docs.python.org/2.7/">Python 2.7 (stable)</a></li>
-   <li><a href="http://docs.python.org/3.4/">Python 3.4 (stable)</a></li>
-   <li><a href="http://www.python.org/doc/versions/">Old versions</a></li>
+   <li><a href="https://docs.python.org/2.7/">Python 2.7 (stable)</a></li>
 -  <li><a href="https://docs.python.org/3.3/">Python 3.3 (stable)</a></li>
 -  <li><a href="https://docs.python.org/3.5/">Python 3.5 (in development)</a></li>
++  <li><a href="https://docs.python.org/3.4/">Python 3.4 (stable)</a></li>
+   <li><a href="https://www.python.org/doc/versions/">Old versions</a></li>
  </ul>
  
  <h3>Other resources</h3>

diff --cc Doc/whatsnew/2.1.rst
Simple merge

diff --cc Doc/whatsnew/3.3.rst
Simple merge