Merge remote-tracking branch 'upstream/pull/1583'
authorTom Hughes <tom@compton.nu>
Wed, 12 Jul 2017 16:53:49 +0000 (17:53 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 12 Jul 2017 16:53:49 +0000 (17:53 +0100)

Trivial merge