Merge branch 'gh-pages' into merge-template