windows opengl fixes
Merge branch 'master' into windows-build
fix conflicts master->windows-build