Merge branch 'dev' into 3.5

Author: freakboy3742

.github/workflows/release.yaml

@@ -80,6 +80,12 @@ jobs:
         # For a list of SDKs available on Github Actions, see:
         # https://github.com/actions/virtual-environments/blob/master/images/macos/macos-10.15-Readme.md
         sudo xcode-select --switch /Applications/Xcode_11.3.1.app
+
+        # 2020-06-24: The Homebrew copy of gettext leaks into the macOS build
+        # if it is present. Uninstall gettext to make sure that doesn't happen.
+        sudo brew uninstall --ignore-dependencies gettext
+
+        # Do the build for the requested target.
         make -e ${{ matrix.target }}
     - name: Upload ${{ matrix.target }} release asset
       uses: actions/upload-release-asset@v1

patch/Python/Setup.embedded

@@ -3,7 +3,7 @@
 #####################################################################
 
 _bisect _bisectmodule.c
-_bz2 _bz2module.c -I$(srcdir)/../bzip2/include -L$(srcdir)/../Support/BZip2 -lbz2
+_bz2 _bz2module.c -I$(srcdir)/../Support/BZip2/Headers -L$(srcdir)/../Support/BZip2 -lbzip2
 _codecs _codecsmodule.c
 _codecs_cn cjkcodecs/_codecs_cn.c
 _codecs_hk cjkcodecs/_codecs_hk.c
@@ -25,7 +25,7 @@ _io -DPy_BUILD_CORE -I$(srcdir)/Modules/_io _io/_iomodule.c _io/iobase.c _io/fil
 _json _json.c
 _locale _localemodule.c
 _lsprof _lsprof.o rotatingtree.c
-_lzma _lzmamodule.c -I$(srcdir)/../xz/include -L$(srcdir)/../Support/XZ -llzma
+_lzma _lzmamodule.c -I$(srcdir)/../Support/XZ/Headers -L$(srcdir)/../Support/XZ/ -lxz
 _md5 md5module.c
 _multibytecodec cjkcodecs/multibytecodec.c
 _multiprocessing _multiprocessing/multiprocessing.c _multiprocessing/semaphore.c