Merge remote-tracking branch 'upstream/pull/1827'
authorTom Hughes <tom@compton.nu>
Wed, 18 Apr 2018 19:21:52 +0000 (20:21 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 18 Apr 2018 19:21:52 +0000 (20:21 +0100)

Trivial merge