Merge pull request #1954 from jefferyto/python-enum34