This change was only made in 0.9.7-stable.  Synchronise
This change was only made in 0.9.7-stable.  Synchronise

openssl/openssl,openssl/openssl,openssl/openssl,openssl/openssl,openssl/openssl,openssl/openssl