Merge branch 'vs2015-no-sdk' into release-3.13

Merge-request: !2656