Branch merge

diff --cc Misc/NEWS
index 96e9ff5020f9a23b2db661c4f49052b160fa3404,3d358239e8ab953c5e31650d8cc02a5e4058be82..7218bfd49d9500352ec5e5297ce979eb42aece60
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -274,10 -274,9 +274,14 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #12306: Expose the runtime version of the zlib C library as a constant,
 +  ZLIB_RUNTIME_VERSION, in the zlib module. Patch by Torsten Landschoff.
 +
 +- Issue #12959: Add collections.ChainMap to collections.__all__.
++ 
+ - Issue #8933: distutils' PKG-INFO files and packaging's METADATA files will
+   now correctly report Metadata-Version: 1.1 instead of 1.0 if a Classifier or
+   Download-URL field is present.
  
  - Issue #12567: Add curses.unget_wch() function. Push a character so the next
    get_wch() will return it.