Fix path to bundle
Merge branch 'master' into gh-pages