Merge branch 'ep/use-git-trace-curl-in-tests'