Merge commit '6db0ef09c4a8b7c1842fc08d37c62692f4f91ebb' * commit '6db0ef09c4a8b7c1842fc08d37c62692f4f91ebb': Verify hostname where possible, and clarify where not.
Merge commit '6db0ef09c4a8b7c1842fc08d37c62692f4f91ebb' * commit '6db0ef09c4a8b7c1842fc08d37c62692f4f91ebb': Verify hostname where possible, and clarify where not.