Merge branch 'gh-pages'
BaseURL update
Merge branch 'master' into gh-pages