ssl fix
Merge branch 'hotfix/ssl2'