Merge remote-tracking branch 'upstream/pull/6050'
authorTom Hughes <tom@compton.nu>
Sat, 24 May 2025 15:57:12 +0000 (16:57 +0100)
committerTom Hughes <tom@compton.nu>
Sat, 24 May 2025 15:57:12 +0000 (16:57 +0100)

Trivial merge