Merge pull request #1459 from bradymiller/more-openssl-stuff_1