Merge remote-tracking branch 'upstream/pull/2010'
authorTom Hughes <tom@compton.nu>
Wed, 3 Oct 2018 21:39:17 +0000 (22:39 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 3 Oct 2018 21:39:17 +0000 (22:39 +0100)

Trivial merge