Merge branch 'vs-win10-sdk' into release