Minor SSL fix
Merge branch 'master' of https://github.com/gabtremblay/tachyon