Merge remote-tracking branch 'upstream/master' into bpo-19675

# Conflicts: # Lib/test/_test_multiprocessing.py
3bdbf79d6bc06e13c8465f4b838f3d8e40bd6659
commit 3bdbf79d6bc06e13c8465f4b838f3d8e40bd6659
diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
@@ -4643,6 +4643,12 @@ def is_alive(self):
            any(process.is_alive() for process in forked_processes))


#
# Mixins
#
-Original file line number
+Diff line change
@@ Expand Up / @@ -4643,6 +4643,12 @@ def is_alive(self): @@
                 any(process.is_alive() for process in forked_processes))
     #
     # Mixins
     #
@@ Expand Down @@