Merge branch 'rh/maint-gitweb-highlight-ext'