Fix compile error on Visual Studio
Merge pull request #2385 from karipe/development

Fix compile error on Visual Studio