Merge branch 'vs15-GNUtoMS' into release