Merge pull request #2165 from jwillemsen/jwi-vcpkg