Merge remote-tracking branch 'upstream/pull/2044'
authorTom Hughes <tom@compton.nu>
Mon, 5 Nov 2018 21:22:48 +0000 (21:22 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 5 Nov 2018 21:22:48 +0000 (21:22 +0000)

Trivial merge