Merge remote-tracking branch 'github/pull/242'
authorTom Hughes <tom@compton.nu>
Wed, 3 Jul 2019 17:24:57 +0000 (18:24 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 3 Jul 2019 17:24:57 +0000 (18:24 +0100)

Trivial merge