Merge remote-tracking branch 'upstream/pull/1835'
authorTom Hughes <tom@compton.nu>
Wed, 25 Apr 2018 16:37:34 +0000 (17:37 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 25 Apr 2018 16:37:34 +0000 (17:37 +0100)

Trivial merge