Merge branch 't/pending/updates' into refs/top-bases/gitweb-additions