Build fix for VS 2012.
Merge pull request #3819 from thedax/2012BuildFix

Build fix for VS 2012.