Merge remote-tracking branch 'upstream/pull/2012'
authorTom Hughes <tom@compton.nu>
Wed, 3 Oct 2018 17:54:19 +0000 (18:54 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 3 Oct 2018 17:54:19 +0000 (18:54 +0100)

Trivial merge