Make jshint content.
Make jshint content.
Merge branch 'master' into gh-pages