Merge remote-tracking branch 'origin/master'

Author: ionelmc

tests/test_pytest_cov.py

@@ -803,6 +803,8 @@ def test_run_target():
     assert result.ret == 0
 
 
+@pytest.mark.skipif('sys.platform == "win32"',
+                    reason="multiprocessing don't support clean process temination on Windows")
 def test_multiprocessing_subprocess_with_terminate(testdir):
     py.test.importorskip('multiprocessing.util')