Remove shadowed function warning
Merge branch 'master' into glbinding1.0