Merge branch 'os/gitweb-highlight-uncaptured' into maint