Merge branch 'pixelgeek_Windows_single_threaded'