Merge pull request #3986 from colemanw/String