update github-pages 28
Merge branch 'upstream'
fix typo