Only initialise OpenGL if the user intends to load it (for real this time)
Fix what !785 (closed) tried to fix, but correctly.
Merge !794 (merged) first, since this is based out of the branch from that request.
Fix what !785 (closed) tried to fix, but correctly.
Merge !794 (merged) first, since this is based out of the branch from that request.