Merge remote-tracking branch 'upstream/pull/1866'
authorTom Hughes <tom@compton.nu>
Wed, 16 May 2018 17:57:34 +0000 (18:57 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 16 May 2018 17:57:34 +0000 (18:57 +0100)

Trivial merge