Merge branch 'vendor/GCC50'
authorJohn Marino <draco@marino.st>
Thu, 2 Apr 2015 22:56:45 +0000 (00:56 +0200)
committerJohn Marino <draco@marino.st>
Thu, 2 Apr 2015 22:56:45 +0000 (00:56 +0200)

Trivial merge