Use a .jshintrc
Merge branch 'master' into docs