Merge "minor spelling cleanup in comments"