Merge remote-tracking branch 'github/pull/349' into master
authorTom Hughes <tom@compton.nu>
Sat, 28 Nov 2020 10:53:38 +0000 (10:53 +0000)
committerTom Hughes <tom@compton.nu>
Sat, 28 Nov 2020 10:53:38 +0000 (10:53 +0000)

Trivial merge