Merge branch 'dl/remote-curl-deadlock-fix'