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