Added SSL support.
Merge /srv/GITROOT/Tardis