Merge branch 'master' into gh-pages
Added trailing slash
Merge branch 'gh-pages'