Back-port of gh-page updates