Merge remote-tracking branch 'upstream/pull/2049'
authorTom Hughes <tom@compton.nu>
Wed, 7 Nov 2018 09:03:01 +0000 (09:03 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 7 Nov 2018 09:03:01 +0000 (09:03 +0000)

Trivial merge