Merge remote-tracking branch 'upstream/pull/2042'
authorTom Hughes <tom@compton.nu>
Sun, 4 Nov 2018 14:49:27 +0000 (14:49 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 4 Nov 2018 14:49:27 +0000 (14:49 +0000)

Trivial merge