Merge branch 't/projlist/keeptop' into refs/top-bases/gitweb-additions