check for "host" if "host:port" does not match
Merge remote-tracking branch 'origin/master'