Merge branch 'vendor/NVI2'
authorJohn Marino <draco@marino.st>
Sat, 8 Aug 2015 16:58:59 +0000 (18:58 +0200)
committerJohn Marino <draco@marino.st>
Sat, 8 Aug 2015 16:58:59 +0000 (18:58 +0200)

Trivial merge