Merge remote-tracking branch 'upstream/master' into HEAD
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Sat, 19 Dec 2020 15:05:08 +0000 (16:05 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Sat, 19 Dec 2020 15:05:08 +0000 (16:05 +0100)

Trivial merge