Merge pull request #1765 from shackbarth/jshint