Fixed openGL madness
Merge remote-tracking branch 'GITHUB/master'