Fix Visual Studio 2013 build.
Merge pull request #3830 from thedax/fix2013Build

Fix Visual Studio 2013 build.