Merge branch 'jn/gitweb-js'