Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
making jslint a little bit happier
Merge branch 'gh-pages'