Do we really need to cherry-pick just build mechanism fixes? I mean, we already have builds for Windows that are configured correctly. And yes, I fully expect to be overruled here... --tml