Merge branch 'double-quotes' into my-fixes
Merge branch 'master' into my-fixes
handles escaped characters