Merge pull request #14838 from ja-pa/python-packaging-20.9