Merge pull request #2517 from jefferyto/python-attrs