Merge branch 'jn/gitweb-test-lib' into next