Merge branch 'jn/gitweb-patch'