Merge remote-tracking branch 'origin/6.0' into 6.0
authorCyperghost <olaf_schmitz_1@t-online.de>
Wed, 10 Jan 2024 11:14:16 +0000 (12:14 +0100)
committerCyperghost <olaf_schmitz_1@t-online.de>
Wed, 10 Jan 2024 11:14:16 +0000 (12:14 +0100)

Trivial merge