Fix VS2013 build.
Merge pull request #4646 from thedax/fixVS2013

Fix VS2013 build.