Merge "Proper fix of a msvc complier warning"