Merge pull request #15828 from jefferyto/python-attrs-21.2.0