Fix build
Merge branch 'master' of https://github.com/bjz/glcore-rs