Merge remote-tracking branch 'upstream/pull/1814'
authorTom Hughes <tom@compton.nu>
Sun, 15 Apr 2018 18:52:31 +0000 (19:52 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 15 Apr 2018 18:52:31 +0000 (19:52 +0100)

Trivial merge