Merge branch 'vs2017-sdk-detection' into release