quick support for SSL
Merge branch 'master' into user-management