Merge branch 'jn/gitweb-syntax-highlight' into next