Bring code up to date with OpenSSL master. Will port to trunk after I see how Gump does with the changes