Fix Windows build error.
Merge pull request #2593 from thedax/master

Fix Windows build error