Merge branch '6.0'
authorCyperghost <olaf_schmitz_1@t-online.de>
Mon, 14 Oct 2024 09:05:28 +0000 (11:05 +0200)
committerCyperghost <olaf_schmitz_1@t-online.de>
Mon, 14 Oct 2024 09:05:28 +0000 (11:05 +0200)

Trivial merge