Merge branch 'aybe-patch-2' of feature/vcpkg_docs