Merge remote-tracking branch 'upstream/pull/1796'
authorTom Hughes <tom@compton.nu>
Thu, 29 Mar 2018 07:35:03 +0000 (08:35 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 29 Mar 2018 07:35:03 +0000 (08:35 +0100)

Trivial merge