Merge branch 'vendor/TCSH'
authorJohn Marino <draco@marino.st>
Wed, 4 Nov 2015 14:37:50 +0000 (15:37 +0100)
committerJohn Marino <draco@marino.st>
Wed, 4 Nov 2015 14:37:50 +0000 (15:37 +0100)

Trivial merge