Merge remote-tracking branch 'upstream/pull/2205'
authorTom Hughes <tom@compton.nu>
Sun, 14 Apr 2019 15:09:04 +0000 (16:09 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 14 Apr 2019 15:09:04 +0000 (16:09 +0100)

Trivial merge