Merge pull request #22035 from jefferyto/python-yaml-6.0.1