Merge branch 'vendor/GCC50'
authorJohn Marino <draco@marino.st>
Sun, 22 Mar 2015 20:53:42 +0000 (21:53 +0100)
committerJohn Marino <draco@marino.st>
Sun, 22 Mar 2015 20:53:42 +0000 (21:53 +0100)

Trivial merge