Merge branch 'jk/maint-gitweb-test-use-sane-perl'