Improvements to ssl handling
Merge branch 'master' into 0.8