Merge branch 'jn/gitweb-dependency' into maint