Merge remote-tracking branch 'upstream/pull/1850'
authorTom Hughes <tom@compton.nu>
Sun, 13 May 2018 14:23:54 +0000 (15:23 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 13 May 2018 14:23:54 +0000 (15:23 +0100)

Trivial merge