Merge remote-tracking branch 'upstream/pull/2182'
authorTom Hughes <tom@compton.nu>
Tue, 19 Mar 2019 13:29:49 +0000 (13:29 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 19 Mar 2019 13:29:49 +0000 (13:29 +0000)

Trivial merge