Merge branch 'cw/gitweb-hilite-config'