Merge remote-tracking branch 'upstream/pull/2028'
authorTom Hughes <tom@compton.nu>
Sun, 19 May 2019 16:14:19 +0000 (17:14 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 19 May 2019 16:14:19 +0000 (17:14 +0100)

Trivial merge