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