Merge branch 'vendor/GCC50'
authorJohn Marino <draco@marino.st>
Sat, 18 Jul 2015 07:51:54 +0000 (09:51 +0200)
committerJohn Marino <draco@marino.st>
Sat, 18 Jul 2015 07:51:54 +0000 (09:51 +0200)

Trivial merge