Merge remote-tracking branch 'origin/main' into v2.17.x v2.17.27
authorCarl Hetherington <cth@carlh.net>
Mon, 9 Dec 2024 00:42:43 +0000 (01:42 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 9 Dec 2024 00:42:43 +0000 (01:42 +0100)

Trivial merge