Merge remote-tracking branch 'upstream/pull/2236'
authorTom Hughes <tom@compton.nu>
Wed, 29 May 2019 10:05:21 +0000 (11:05 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 29 May 2019 10:05:21 +0000 (11:05 +0100)

Trivial merge