Merge remote-tracking branch 'upstream/pull/1948'
authorTom Hughes <tom@compton.nu>
Tue, 28 Aug 2018 17:53:45 +0000 (18:53 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 28 Aug 2018 17:53:45 +0000 (18:53 +0100)

Trivial merge