more_threads=1 on windows
Merge remote-tracking branch 'upstream/master' into next