Merge remote-tracking branch 'upstream/pull/1824'
authorTom Hughes <tom@compton.nu>
Wed, 18 Apr 2018 17:36:22 +0000 (18:36 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 18 Apr 2018 17:36:22 +0000 (18:36 +0100)

Trivial merge