Merge "Fix a clang/win build error"