Merge remote-tracking branch 'upstream/pull/2322'
authorTom Hughes <tom@compton.nu>
Wed, 17 Jul 2019 17:47:02 +0000 (18:47 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 17 Jul 2019 17:47:02 +0000 (18:47 +0100)

Trivial merge