Merge remote-tracking branch 'upstream/pull/1880'
authorTom Hughes <tom@compton.nu>
Thu, 24 May 2018 18:06:31 +0000 (19:06 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 24 May 2018 18:06:31 +0000 (19:06 +0100)

Trivial merge