Merge branch 'jk/maint-gitweb-xss' into maint