Merge branch '3.1.x' into 3.2.x

Author: wilkinsona

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - id: ubuntu-latest
+          - id: ubuntu22-8-32
             name: Linux
           - id: windows-latest
             name: Windows