* Fix double escaping issues introduced in r34320 (bug 14840)