Merge remote-tracking branch 'upstream/pull/2074'
authorTom Hughes <tom@compton.nu>
Wed, 28 Nov 2018 18:09:17 +0000 (18:09 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 28 Nov 2018 18:09:17 +0000 (18:09 +0000)

Trivial merge