Merge branch '8.5' into 9.6

Author: sebastianbergmann

.github/workflows/release.yaml

@@ -41,6 +41,7 @@ jobs:
           tag: ${{ env.RELEASE_TAG }}
           name: PHPUnit ${{ env.RELEASE_TAG }}
           bodyFile: release-notes.md
+          commit: "9.6"
 
       - name: Announce release
         id: mastodon