Merge branch 'vendor/MPC'
authorJohn Marino <draco@marino.st>
Fri, 13 Mar 2015 17:14:46 +0000 (18:14 +0100)
committerJohn Marino <draco@marino.st>
Fri, 13 Mar 2015 17:14:46 +0000 (18:14 +0100)

Trivial merge