Prepping for Merge
Merge for OpenGL fixes
Merge branch 'master' of https://github.com/b3ll/MessageBox