Merge branch 'master' into svg-group-render

.github/workflows/build_and_test.yml

@@ -80,7 +80,7 @@ jobs:
       - name: setup vcpkg
         uses: ./.github/actions/setup_vcpkg
         with:
-          vcpkg-sha: 71d3fa60b67540e9bf5fde2bf2188f579ff09433
+          vcpkg-sha: a960fde0b60b6392d70375fe513dfa7eb083cc3a
           nuget-source: https://nuget.pkg.github.com/mapnik/index.json
           nuget-username: ${{ github.actor }}
           nuget-pat: ${{ secrets.GITHUB_TOKEN }}

benchmark/src/test_font_registration.cpp

@@ -1,7 +1,6 @@
 #include "bench_framework.hpp"
 #include <mapnik/font_engine_freetype.hpp>
 #include <boost/format.hpp>
-#include <boost/foreach.hpp>
 
 class test : public benchmark::test_case
 {