Merge "Fix a build issue with visual c."