Merge pull request #175 from python/hotfix/enabling-ssl

Fixes to enable SSL
Merge pull request #184 from python/develop

Merge develop into master
Merge branch 'master' into develop