larger kludge for escaped characters
Merge branch 'master' into pr/192
Add regression test for UTF and escapes.