Merge branch 'mk/gitweb-diff-hl'