Merge branch '9.6' into 10.5

Author: sebastianbergmann

.github/workflows/ci.yaml

@@ -119,6 +119,7 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
 
     steps:
       - name: Configure Git to avoid issues with line endings
@@ -167,6 +168,7 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
 
     steps:
       - name: Configure Git to avoid issues with line endings
@@ -302,6 +304,7 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
 
         coverage:
           - pcov