More MSVC / Windows support.
Automatic-merge.