Merge remote-tracking branch 'upstream/pull/2196'
authorTom Hughes <tom@compton.nu>
Wed, 3 Apr 2019 18:06:18 +0000 (19:06 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 3 Apr 2019 18:06:18 +0000 (19:06 +0100)

Trivial merge