Fixup windows build
Merge
Merge branch 'master' into invalid-texture-fix