Merge

diff --cc Misc/NEWS
index 22a3a67560de74de17c18169892faf7ad34276f0,7fe9376ff99184a5a97ac7a18ef7c571273908b0..c68749d92bb41e689aff4139d98f98dcbb0201eb
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -83,8 -83,9 +83,11 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #11927: SMTP_SSL now uses port 465 by default as documented.  Patch
+   by Kasun Herath.
+ 
 +- Issue #12002: ftplib's abort() method raises TypeError.
 +
  - Issue 11999: fixed sporadic sync failure mailbox.Maildir due to its trying to
    detect mtime changes by comparing to the system clock instead of to the
    previous value of the mtime.