Merge branch 'svost-msvc-warnings'