quick support for SSL
Merge remote-tracking branch 'upstream/master'