Merge remote-tracking branch 'upstream/pull/1580'
authorTom Hughes <tom@compton.nu>
Mon, 16 Oct 2017 18:08:32 +0000 (19:08 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 16 Oct 2017 18:08:32 +0000 (19:08 +0100)

Trivial merge