Merge remote-tracking branch 'upstream/pull/2123'
authorTom Hughes <tom@compton.nu>
Mon, 28 Jan 2019 22:57:38 +0000 (22:57 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 28 Jan 2019 22:57:38 +0000 (22:57 +0000)

Trivial merge