Merge branch 'rj/highlight-test-hang' * rj/highlight-test-hang: gitweb test: fix highlight test hang on Linux Mint