JsFunction string parameters escape fix
Merge branch 'JsFunctionEscape2'