Fixes #899
Merge pull request #900 from yeoman/jshintrc-fix

Fixes #899
Merge branch 'master' into polyconseil