jslint
Merge remote-tracking branch 'upstream/master' into jslint
remove extra comma
Merge pull request #161332 from mauk81/jslint

jslint