Merge remote-tracking branch 'github/pull/240'
authorTom Hughes <tom@compton.nu>
Fri, 31 May 2019 09:29:13 +0000 (10:29 +0100)
committerTom Hughes <tom@compton.nu>
Fri, 31 May 2019 09:29:13 +0000 (10:29 +0100)

Trivial merge