Merge branch '5.4' into 6.4

* 5.4:
  Revert "minor #54653 Auto-close PRs on subtree-splits (nicolas-grekas)"

Author: fabpot

.gitattributes

@@ -1,3 +1,4 @@
 /Tests export-ignore
 /phpunit.xml.dist export-ignore
-/.git* export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore