Merge branch 'jn/gitweb-config-error-die'