Merge remote-tracking branch 'upstream/pull/1797'
authorTom Hughes <tom@compton.nu>
Wed, 28 Mar 2018 16:33:01 +0000 (17:33 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 28 Mar 2018 16:33:01 +0000 (17:33 +0100)

Trivial merge