24c737ccdd
Merge commit 'd581484ef8fac80c15ebf652e66f918374df5109' into gingerbread * commit 'd581484ef8fac80c15ebf652e66f918374df5109': Verify hostname where possible, and clarify where not.