Merge #9298 fix.

diff --cc Lib/email/encoders.py
Simple merge

diff --cc Lib/email/test/test_email.py
Simple merge

diff --cc Misc/ACKS
index 1e2b83d4cedf5901f6993cd0c3c6326a789a7baa,5d9b198301edf982c73d854325ddf2b344b9f87e..0cbc6703d27e057595e7e1f1b6a406199971d20f
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -223,8 -201,8 +223,9 @@@ Yves Dionn
  Daniel Dittmar
  Jaromir Dolecek
  Ismail Donmez
 +Marcos Donolo
  Dima Dorfman
+ Yves Dorfsman
  Cesar Douady
  Dean Draayer
  Fred L. Drake, Jr.

diff --cc Misc/NEWS
index 419b0d5dcc0d5a7a6b1395ca0ed1b41770c197b2,beb6ec1c1210cb8f7f5381b8151ba5003e8484bc..9af1442468017dab7e55d8f372c0e2aaf84b88ae
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -40,12 -40,10 +40,16 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #9298: base64 bodies weren't being folded to line lengths less than 78,
+   which was a regression relative to Python2.  Unlike Python2, the last line
+   of the folded body now ends with a carriage return.
+ 
 +- Issue #11560: shutil.unpack_archive now correctly handles the format
 +  parameter. Patch by Evan Dandrea.
 +
 +- Issue #11133: fix two cases where inspect.getattr_static can trigger code
 +  execution. Patch by Andreas Stührk.
 +
  - Issue #11569: use absolute path to the sysctl command in multiprocessing to
    ensure that it will be found regardless of the shell PATH. This ensures
    that multiprocessing.cpu_count works on default installs of MacOSX.