Merge branch 'vendor/XZ'
authorJohn Marino <draco@marino.st>
Tue, 3 Nov 2015 12:13:43 +0000 (13:13 +0100)
committerJohn Marino <draco@marino.st>
Tue, 3 Nov 2015 12:13:43 +0000 (13:13 +0100)

Trivial merge