Merge branch 't/config/escname' into refs/top-bases/gitweb-additions