Merge branch 'jk/maint-gitweb-xss'