Updated windows .inf file to compatible version
Merge remote-tracking branch 'upstream/edge' into edge