Merge branch 'jn/maint-gitweb-dynconf'