Merge pull request #21794 from jefferyto/python-multidict-6.0.4