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

Trivial merge