Created attachment 362462 [details] build.log fails to build, alternates between replicating 100% and being completely impossible to replicate for me.
Created attachment 362464 [details, diff] Proposed patch
in my testing, I was able to get the build to fail a few times in a row, then worked a few times in a row with the patch. ZC tested, ZC approved
Looks good to me; I've also told upstream about it, we usually get a response within a day or so.
Thanks a lot, is committed. (Upstream did the same change in newer releases too.)