Closes #21931: Merge with 3.4

diff --cc Misc/NEWS
index 850ec50291562f3862ae2275a00485cf37925e16,ed646ada53de749dd7291b322424edc493c90a3a..b51a9f2087115ca68a5fba90166c67291d4e023b
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -47,37 -48,10 +47,41 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #21931: msilib.FCICreate() now raises TypeError in the case of a bad
+   argument instead of a ValueError with a bogus FCI error number.
+   Patch by Jeffrey Armstrong.
+ 
 +- Issue #13866: *quote_via* argument added to urllib.parse.urlencode.
 +
 +- Issue #20098: New mangle_from_ policy option for email, default True
 +  for compat32, but False for all other policies.
 +
 +- Issue #24211: The email library now supports RFC 6532: it can generate
 +  headers using utf-8 instead of encoded words.
 +
 +- Issue #16314: Added support for the LZMA compression in distutils.
 +
 +- Issue #21804: poplib now supports RFC 6856 (UTF8).
 +
 +- Issue #18682: Optimized pprint functions for builtin scalar types.
 +
 +- Issue #22027: smtplib now supports RFC 6531 (SMTPUTF8).
 +
 +- Issue #23488: Random generator objects now consume 2x less memory on 64-bit.
 +
 +- Issue #1322: platform.dist() and platform.linux_distribution() functions are
 +  now deprecated.  Initial patch by Vajrasky Kok.
 +
 +- Issue #22486: Added the math.gcd() function.  The fractions.gcd() function now is
 +  deprecated.  Based on patch by Mark Dickinson.
 +
 +- Issue #24064: Property() docstrings are now writeable.
 +  (Patch by Berker Peksag.)
 +
 +- Issue #22681: Added support for the koi8_t encoding.
 +
 +- Issue #22682: Added support for the kz1048 encoding.
 +
  - Issue #23796: peak and read1 methods of BufferedReader now raise ValueError
    if they called on a closed object. Patch by John Hergenroeder.