Merge remote-tracking branch 'upstream/pull/1769'
authorTom Hughes <tom@compton.nu>
Tue, 27 Feb 2018 20:22:15 +0000 (20:22 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 27 Feb 2018 20:22:15 +0000 (20:22 +0000)

Trivial merge