Merge branch 'jn/gitweb'