Merge pull request #1939 for escaping