Merge branch '8.5' into 9.6

Author: sebastianbergmann

.github/workflows/ci.yaml

@@ -118,6 +118,7 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
 
     steps:
       - name: Configure git to avoid issues with line endings
@@ -168,6 +169,7 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
 
     steps:
       - name: Configure git to avoid issues with line endings
@@ -297,6 +299,7 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
 
         coverage:
           - pcov