Merge branch 'kn/gitweb-extra-branch-refs'