Merge from vendor branch OPENSSL: