Merge remote-tracking branch 'upstream/pull/1659'
authorTom Hughes <tom@compton.nu>
Tue, 24 Oct 2017 19:19:46 +0000 (20:19 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 24 Oct 2017 19:19:46 +0000 (20:19 +0100)

Trivial merge