Merge remote-tracking branch 'upstream/pull/2160'
authorTom Hughes <tom@compton.nu>
Thu, 28 Feb 2019 18:58:05 +0000 (18:58 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 28 Feb 2019 18:58:05 +0000 (18:58 +0000)

Trivial merge