Merge remote-tracking branch 'origin/master' into pyopenssl-test_crypto-with-optionals