Merge remote-tracking branch 'upstream/master' into HEAD
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Mon, 28 Dec 2020 18:20:52 +0000 (19:20 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Mon, 28 Dec 2020 18:20:52 +0000 (19:20 +0100)

Trivial merge