Merge remote-tracking branch 'upstream/pull/2294'
authorTom Hughes <tom@compton.nu>
Sun, 30 Jun 2019 14:27:25 +0000 (15:27 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 30 Jun 2019 14:27:25 +0000 (15:27 +0100)

Trivial merge