Merge branch 'gh-pages-gen' into gh-pages