rename "ssl" to "secure" and avoid a token clash with openssl internals while at it
Merge branch 'master' into portable