Branch merge

diff --cc Misc/NEWS
index 16e0e40d0f745317ffbfc0f020d7dd9a8f0eedae,2886160a6a37fa08525eb026fefb23b894790816..8f67bf02a10050a5faaeca6072ea2e9983d29996
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -271,14 -271,9 +271,17 @@@ 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 #12888: Fix a bug in HTMLParser.unescape that prevented it to escape
 +  more than 128 entities.  Patch by Peter Otten.
 +
  - Issue #12878: Expose a __dict__ attribute on io.IOBase and its subclasses.
  
  - Issue #12636: IDLE reads the coding cookie when executing a Python script.