Merge "Fix inadvertent paste in the middle of a comment."