Merge the W32 patch from Evan and his coworker.