Merge pull request #5661 from lhchavez/windows-leak-detection-deflake Make the Windows leak detection more robust