Merge remote-tracking branch 'upstream/pull/1788'
authorTom Hughes <tom@compton.nu>
Sun, 25 Mar 2018 13:27:16 +0000 (14:27 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 25 Mar 2018 13:27:16 +0000 (14:27 +0100)

Trivial merge