Merge remote-tracking branch 'github/pull/252'
authorTom Hughes <tom@compton.nu>
Sat, 7 Sep 2019 15:28:13 +0000 (16:28 +0100)
committerTom Hughes <tom@compton.nu>
Sat, 7 Sep 2019 15:28:13 +0000 (16:28 +0100)

Trivial merge