Merge branch 'sr/gitweb-hilite-more'