Merge pull request #807 from hnyman/ssl-openssl