Hack OpenGL DisplayLists into rendering
Merge branch 'master' into eric/opengl-displaylists