Merge "Visual Studio build (warning) fix"