Merge patch to fix build under VS2010

4 files changed