Merge branch 'jc/no-gitweb-test-without-cgi-etc'