Merge branch 'sk/gitweb-highlight-encoding'