Merge branch 'jn/gitweb-per-request-config'