fixes issue #336

fixes issue #336
Merge remote-tracking branch 'origin/https-fix' into ci