Merge from tip

diff --cc Misc/NEWS
index 2e4f15d47a0e4e87f19d33c9c0a9598b75986c8c,96ce07c3af9fb86a46689441f2b3893cf2d29391..8dace0c7591351ab9af6db7be780960a795bd034
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -24,8 -24,16 +24,18 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #14200: Idle shell crash on printing non-BMP unicode character.
 +
+ - Issue #12818: format address no longer needlessly \ escapes ()s in names when
+   the name ends up being quoted.
+ 
+ - Issue #14062: BytesGenerator now correctly folds Header objects,
+   including using linesep when folding.
+ 
+ - Issue #13839: When invoked on the command-line, the pstats module now
+   accepts several filenames of profile stat files and merges them all.
+   Patch by Matt Joiner.
+ 
  - Issue #14291: Email now defaults to utf-8 for non-ASCII unicode headers
    instead of raising an error.  This fixes a regression relative to 2.7.