Merge pull request #3735 from evolutional/vs2010-buildfix

Buildfix for VS2010