Merge branch 'ik/gitweb-force-highlight'