Merge commit 'refs/top-bases/gitweb-additions' into gitweb-additions