Merge remote-tracking branch 'upstream/pull/2000'
authorTom Hughes <tom@compton.nu>
Sat, 22 Sep 2018 16:03:50 +0000 (17:03 +0100)
committerTom Hughes <tom@compton.nu>
Sat, 22 Sep 2018 16:03:50 +0000 (17:03 +0100)

Trivial merge