Merge pull request #161 from mikeh/master

Follow-up fix for SSL workaround