Merge "Fix a msvc compiler warning"