Merge heads

diff --cc Misc/NEWS
index 715539d52506688a3807996020aad92e58f9c94f,503661acdfce02d79ee4e14a8931e9540453f173..0514c9652798ff21f5ff435e18dc53e87e9170c4
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -161,11 -161,9 +161,14 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #1625: BZ2File and bz2.decompress() now support multi-stream files.
+   Initial patch by Nir Aides.
+ 
 +- Issue #8796: codecs.open() calls the builtin open() function instead of using
 +  StreamReaderWriter. Deprecate StreamReader, StreamWriter, StreamReaderWriter,
 +  StreamRecoder and EncodedFile() of the codec module. Use the builtin open()
 +  function or io.TextIOWrapper instead.
 +
  - Issue #12175: BufferedReader.read(-1) now calls raw.readall() if available.
  
  - Issue #12175: FileIO.readall() now only reads the file position and size