Merge remote-tracking branch 'upstream/pull/1983'
authorTom Hughes <tom@compton.nu>
Mon, 10 Sep 2018 17:53:09 +0000 (18:53 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 10 Sep 2018 17:53:09 +0000 (18:53 +0100)

Trivial merge