Merge branch 't/misc/plural' into refs/top-bases/gitweb-additions