Updated with OpenSSL 1.0.1j