JWZ's OpenGL compatibility shim from xscreensaver-5.21
Merge remote-tracking branch 'origin/master'