Merge pull request #15295 from colemanw/jsEncode2