Merge remote-tracking branch 'upstream/pull/2151'
authorTom Hughes <tom@compton.nu>
Wed, 20 Feb 2019 22:13:50 +0000 (22:13 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 20 Feb 2019 22:13:50 +0000 (22:13 +0000)

Trivial merge