Merge pull request #3227 from jefferyto/python-cryptography-1.5.1