Merge remote-tracking branch 'upstream/master' into HEAD
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Mon, 14 Dec 2020 23:33:25 +0000 (00:33 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Mon, 14 Dec 2020 23:33:25 +0000 (00:33 +0100)

Trivial merge