Merge branch 'jn/gitweb-utf8'