merge 3.5 (#27969)

Lib/test/test_gdb.py

@@ -24,6 +24,7 @@ def get_gdb_version():
     try:
         proc = subprocess.Popen(["gdb", "-nx", "--version"],
                                 stdout=subprocess.PIPE,
+                                stderr=subprocess.PIPE,
                                 universal_newlines=True)
         with proc:
             version = proc.communicate()[0]