Fix for possible GL30+ version checking bug
Merge remote-tracking branch 'upstream/master'