Branch merge

diff --cc Misc/NEWS
index 11f98a7f47ab703cc5af59d675ba97ca4ad280f3,d58da6a1acf2581bb470eb2b8fb8abdf8bf2d4d3..b46cea822ec19b4ad7fd5a9359ca979bf2270d25
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -350,15 -350,14 +350,19 @@@ Core and Builtin
  Library
  -------
  
+ - Byte compilation in packaging is now isolated from the calling Python -B or
+   -O options, instead of being disallowed under -B or buggy under -O.
+ 
 +- Issue #10570: curses.tigetstr() is now expecting a byte string, instead of
 +  a Unicode string.
 +
 +- Issue #13295: http.server now produces valid HTML 4.01 strict.
 +
  - Issue #2892: preserve iterparse events in case of SyntaxError.
  
- - Issue #13287: urllib.request and urllib.error now contains a __all__ and
-   exposes only relevant Classes, Functions. Patch by Florent Xicluna.
+ - Issue #13287: urllib.request and urllib.error now contains an __all__
 -  attribute to expose only public classes and functions.  Patch by Florent
++  attribute to expose only relevant classes and functions.  Patch by Florent
+   Xicluna.
  
  - Issue #670664: Fix HTMLParser to correctly handle the content of
    ``<script>...</script>`` and ``<style>...</style>``.