Fix redeclared gl functions for windows build
Merge branch 'master' into windows-build