Merge updates from STJr:master

OpenGL stuff.