Merge branch 'jn/gitweb-js-blame' into next