Merge branch 'master' into GLExtensions Conflicts: CMakeLists.txt Source/Core/VideoBackends/OGL/GLUtil.h Source/Core/VideoBackends/OGL/Render.cpp