Merge pull request #10151 from jefferyto/python-bpo-38243-34155