Merge "Fix a visual studio warning"