Merge remote-tracking branch 'upstream/pull/2050'
authorTom Hughes <tom@compton.nu>
Thu, 8 Nov 2018 17:31:30 +0000 (17:31 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 8 Nov 2018 17:31:30 +0000 (17:31 +0000)

Trivial merge