Branch merge

diff --cc Misc/NEWS
index 09293ca84215d128487b95c50bb2572a1a52d05b,87477c9d6d7e678d61f3b8acafe81529bc175ff7..ba1d4244c5e63b099bab92f84eb15e664e8ba587
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -81,13 -75,11 +81,16 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #11371: Mark getopt error messages as localizable.  Patch by Filip
+   Gruszczyński.
+ 
 +- Issue #5537: Fix time2isoz() and time2netscape() functions of
 +  httplib.cookiejar for expiration year greater than 2038 on 32-bit systems.
 +
  - Issue #4391: Use proper gettext plural forms in optparse.
  
 +- Issue #11127: Raise a TypeError when trying to pickle a socket object.
 +
  - Issue #11563: Connection:close header is sent by requests using URLOpener
    class which helps in closing of sockets after connection is over. Patch
    contributions by Jeff McNeil and Nadeem Vawda.