Merge pull request #2996 from jefferyto/python-enum34-1.1.6