Merge branch 'vendor/TRE'
authorJohn Marino <draco@marino.st>
Thu, 6 Aug 2015 22:06:35 +0000 (00:06 +0200)
committerJohn Marino <draco@marino.st>
Thu, 6 Aug 2015 22:06:35 +0000 (00:06 +0200)

Trivial merge