Merge "Fix Windows build."