Merge remote-tracking branch 'upstream/master'

Conflicts:
	OpenGL32/src/Hooks/Hooks.cpp
	OpenGL32/src/Hooks/Structures.cpp
	OpenGL32/src/Hooks/Structures.hpp