Changed character strings to be escaped automatically.
Merge branch 'master' into mac