Merge back @vlj's local patches of vcpkg
2 files changed