merge with 3.4

diff --cc Doc/tutorial/interpreter.rst
index aa84061507e69f098aab35ce876f082d300106c8,9ab77f800962cf6efeb6e38de9606830858aba1a..662501077d13f79dd3550f72ed374c9946679774
--- 1/Doc/tutorial/interpreter.rst
--- 2/Doc/tutorial/interpreter.rst
+++ b/Doc/tutorial/interpreter.rst
@@@ -95,9 -95,9 +95,9 @@@ with the *secondary prompt*, by defaul
  prints a welcome message stating its version number and a copyright notice
  before printing the first prompt::
  
 -   $ python3.4
 -   Python 3.4 (default, Mar 16 2014, 09:25:04)
 +   $ python3.5
 +   Python 3.5 (default, Sep 16 2015, 09:25:04)
-    [GCC 4.8.2] on linux2
+    [GCC 4.8.2] on linux
     Type "help", "copyright", "credits" or "license" for more information.
     >>>