Merge branch 'master' into gh-pages
Regenerate bundle.js using deploy.sh