Merge remote-tracking branch 'upstream/pull/2305'
authorTom Hughes <tom@compton.nu>
Thu, 11 Jul 2019 19:23:31 +0000 (20:23 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 11 Jul 2019 19:23:31 +0000 (20:23 +0100)

Trivial merge