Merge in the w32 changes.