Merge branch 'gh-pages' into gh-pages-custom
manually after page generator