Merge remote-tracking branch 'upstream/pull/2248'
authorTom Hughes <tom@compton.nu>
Thu, 6 Jun 2019 16:51:51 +0000 (17:51 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 6 Jun 2019 16:51:51 +0000 (17:51 +0100)

Trivial merge