Typo fix
Changelog, closes #1147
break the loop when the host is gateway itself
Formatting tweaks
Changelog, fixes #1165
Merge branch '1.7' into 1.8