Merge branch 'master' into gh-pages
info-box typo change
Merge branch 'gh-pages'