Fix Windows compilation
Merge remote-tracking branch 'origin/0.98.5' into 0.98.5