Merge pull request #236 from kblees/kb/master/svn-openssl1.0