Merge "Fix a comment"