Merge pull request #5048 from wsnipex/ssl-fix