Merge remote-tracking branch 'origin/master'
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Fri, 5 Nov 2021 14:36:30 +0000 (15:36 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Fri, 5 Nov 2021 14:36:30 +0000 (15:36 +0100)

Trivial merge