manually rebased to upsteam/gh-pages