Merge "Verify hostname where possible, and clarify where not." into froyo