Merge branch 'master' into peternewman-string-double-escape