Merge branch 'release-0.96.0'
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Sun, 3 Apr 2022 17:57:04 +0000 (19:57 +0200)
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Sun, 3 Apr 2022 17:57:04 +0000 (19:57 +0200)

Trivial merge