Merge branch 'vendor/GCC50'
authorJohn Marino <draco@marino.st>
Sun, 8 Mar 2015 14:08:42 +0000 (15:08 +0100)
committerJohn Marino <draco@marino.st>
Sun, 8 Mar 2015 14:08:42 +0000 (15:08 +0100)

Trivial merge