Merge remote-tracking branch 'github/pull/263'
authorTom Hughes <tom@compton.nu>
Fri, 31 Jan 2020 18:05:08 +0000 (18:05 +0000)
committerTom Hughes <tom@compton.nu>
Fri, 31 Jan 2020 18:05:08 +0000 (18:05 +0000)

Trivial merge