Merge "Fix windows build."