Merge remote-tracking branch 'upstream/pull/2278'
authorTom Hughes <tom@compton.nu>
Wed, 26 Jun 2019 12:36:44 +0000 (13:36 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 26 Jun 2019 12:36:44 +0000 (13:36 +0100)

Trivial merge