fix compilation for WT Windows
Merge remote-tracking branch 'upstream/master'