Merge remote-tracking branch 'github/pull/246'
authorTom Hughes <tom@compton.nu>
Wed, 21 Aug 2019 16:06:02 +0000 (17:06 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 21 Aug 2019 16:06:02 +0000 (17:06 +0100)

Trivial merge