Merge conflicts. I hope i fixed them correctly.
Merge remote-tracking branch 'origin/OpenGL3.2_Update' into OpenGL3.2_Update