Merge pull request #5404 from jefferyto/python-cryptography-2.1.4