Merge branch 'fix-jshint-comma-separated'