Merge remote-tracking branch 'github/pull/365' into master
authorTom Hughes <tom@compton.nu>
Wed, 2 Dec 2020 08:29:55 +0000 (08:29 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 2 Dec 2020 08:29:55 +0000 (08:29 +0000)

Trivial merge