Merge remote-tracking branch 'upstream/pull/2223'
authorTom Hughes <tom@compton.nu>
Sun, 7 Jul 2019 15:14:32 +0000 (16:14 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 7 Jul 2019 15:14:32 +0000 (16:14 +0100)

Trivial merge