Merge branch 'vendor/GCC50'
authorJohn Marino <draco@marino.st>
Fri, 27 Feb 2015 10:13:33 +0000 (11:13 +0100)
committerJohn Marino <draco@marino.st>
Fri, 27 Feb 2015 10:13:33 +0000 (11:13 +0100)

Trivial merge