Merge remote-tracking branch 'upstream/pull/2293'
authorTom Hughes <tom@compton.nu>
Sun, 30 Jun 2019 10:57:56 +0000 (11:57 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 30 Jun 2019 10:57:56 +0000 (11:57 +0100)

Trivial merge