Merge branch 'master' into gh-pages
/*jslint browser: true, evil: true, nomen: true */
Merge branch 'gh-pages'