Merge tag 'v1.8.98' into v1.9.x v1.9.3
authorCarl Hetherington <cth@carlh.net>
Wed, 20 Mar 2024 22:15:11 +0000 (23:15 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 20 Mar 2024 22:15:11 +0000 (23:15 +0100)

Trivial merge