Merge with 3.5.

diff --cc Lib/pydoc.py
index f4f253010f49d35994376dacf03dfba99d6a4600,ee558bfea3b58a1b9489c5252cbb1d042a7f3918..f4f253010f49d35994376dacf03dfba99d6a4600
mode 100755,100755..100644
--- 1/Lib/pydoc.py
--- 2/Lib/pydoc.py
+++ b/Lib/pydoc.py

diff --cc Lib/test/regrtest.py
index fcc39375c031aa84eee919c7439cee277b60a00e,a04c3f78b2149d989bb957072924ec724d9b586d..fcc39375c031aa84eee919c7439cee277b60a00e
mode 100755,100755..100644
--- 1/Lib/test/regrtest.py
--- 2/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py

diff --cc Lib/timeit.py
index 98cb3eb89a82e03796f9ea1ab931b6a2f923ed39,2de88f7271a073c24183466b54c5615424d078b4..98cb3eb89a82e03796f9ea1ab931b6a2f923ed39
mode 100755,100755..100644
--- 1/Lib/timeit.py
--- 2/Lib/timeit.py
+++ b/Lib/timeit.py

diff --cc Parser/asdl_c.py
index d5971226b1885aaf12ff36f7128205a690bc3dd6,a5e35d93fd29d26d55c3c34c00fd7ea663f2a8d2..d5971226b1885aaf12ff36f7128205a690bc3dd6
mode 100755,100755..100644
--- 1/Parser/asdl_c.py
--- 2/Parser/asdl_c.py
+++ b/Parser/asdl_c.py

diff --cc configure
index 1046f0a1ba86c2a9ebf4affe40c6367aace909f2,398f12160fc8cb8e9bdd9e061dfc33750d16e78e..1046f0a1ba86c2a9ebf4affe40c6367aace909f2
mode 100755,100755..100644
--- 1/configure
--- 2/configure
+++ b/configure