Merge branch 'refs/heads/6.0'
authorCyperghost <olaf_schmitz_1@t-online.de>
Fri, 26 Apr 2024 10:18:16 +0000 (12:18 +0200)
committerCyperghost <olaf_schmitz_1@t-online.de>
Fri, 26 Apr 2024 10:18:16 +0000 (12:18 +0200)

Trivial merge