Merge pull request #7626 from SlugFiller/patch-1

Support compilation using CLang on Windows