Merge branch 'jn/gitweb-docs'