Merge branch 'master' into work/remove-cmake-fortify-source
authorClaudio Cambra <claudio.cambra@gmail.com>
Tue, 12 Jul 2022 21:28:19 +0000 (23:28 +0200)
committerGitHub <noreply@github.com>
Tue, 12 Jul 2022 21:28:19 +0000 (23:28 +0200)

Trivial merge