Branch merge

diff --cc Misc/NEWS
index b286f8b5827d4781ef6345b4ea23149b70495786,0778cad15fe6684726c83ca15b1746d3ca78f3c2..2b6a8907cfc88d0c9e4097175744825b97f5bf4f
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -39,12 -39,10 +39,15 @@@ Core and Builtin
  
  Library
  -------
 -
++ 
+ - Issue #8286: The distutils command sdist will print a warning message instead
+   of crashing when an invalid path is given in the manifest template.
  
 +- Issue #12841: tarfile unnecessarily checked the existence of numerical user
 +  and group ids on extraction. If one of them did not exist the respective id
 +  of the current user (i.e. root) was used for the file and ownership
 +  information was lost.
 +
  - Issue #10946: The distutils commands bdist_dumb, bdist_wininst and bdist_msi
    now respect a --skip-build option given to bdist.