Win tests should be more stable now
Merge remote-tracking branch 'origin/master'