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

Trivial merge