Fix message since we don't necessarily connect over HTTP anymore
Merge remote-tracking branch 'origin/master'