Merge

diff --cc Misc/NEWS
index 1ef477f09f1e118fde19717e1c20d303c310833a,a4aabbeba4b7617d3ab086123c368c5273e58770..e5fd939b16534bf1aaba4b4a1e58e249a4397732
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -173,10 -173,8 +173,12 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #15699: The readline module now uses PEP 3121-style module
 +  initialization, so as to reclaim allocated resources (Python callbacks)
 +  at shutdown.  Original patch by Robin Schreiber.
 +
+ - Issue #17616: wave.open now supports the context manager protocol.
+ 
  - Issue #18599: Fix name attribute of _sha1.sha1() object. It now returns
    'SHA1' instead of 'SHA'.