Visual Studio 2013 buildfix
Merge pull request #4807 from pal1000/work

Visual Studio 2013 buildfix