Merge remote-tracking branch 'upstream/pull/2063'
authorTom Hughes <tom@compton.nu>
Tue, 29 Jan 2019 21:35:29 +0000 (21:35 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 29 Jan 2019 21:35:29 +0000 (21:35 +0000)

Trivial merge