Merge "Use underscores in help links"