[master] Windows compilation fix.
Merge pull request #3789 from dumganhar/master

[master] Windows compilation fix.