Merge remote-tracking branch 'upstream/pull/1587'
authorTom Hughes <tom@compton.nu>
Mon, 17 Jul 2017 13:27:58 +0000 (14:27 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 17 Jul 2017 13:27:58 +0000 (14:27 +0100)

Trivial merge