Merge branch 'jn/gitweb-manpages'