Merge "Fix intermittent Mac build errors." into eclair