Merge pull request #1900 from jefferyto/python-crypto