Merge branch 'vendor/GCC50'
authorJohn Marino <draco@marino.st>
Tue, 10 Feb 2015 19:21:01 +0000 (20:21 +0100)
committerJohn Marino <draco@marino.st>
Tue, 10 Feb 2015 19:21:01 +0000 (20:21 +0100)

Trivial merge