Merge branch 'vendor/GCC50'
authorJohn Marino <draco@marino.st>
Wed, 22 Apr 2015 19:43:22 +0000 (21:43 +0200)
committerJohn Marino <draco@marino.st>
Wed, 22 Apr 2015 19:43:22 +0000 (21:43 +0200)

Trivial merge