Code

Merge branch 'jn/maint-gitweb-utf8-fix' into maint