Merge remote-tracking branch 'upstream/pull/2281'
authorTom Hughes <tom@compton.nu>
Wed, 26 Jun 2019 18:19:58 +0000 (19:19 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 26 Jun 2019 18:19:58 +0000 (19:19 +0100)

Trivial merge