Merge "Clarify meaning of string"