Merge "fix a msvc compiler warning"