Really fix jshint
Merge branch 'develop'