jshint
Merge pull request #3056 from waywardmonkeys/upstream-jshint-change

jshint