removed option to change to ssl, enabled it by default
Merge remote-tracking branch 'origin/master' into add_calendar