All kinds of changes from branch OpenSSL_0_9_7-stable