Merge pull request #1726 from saper/escaped