Merge branch 'master' into unified-glretrace

Conflicts:
	dispatch/glproc.py
	dispatch/glproc_egl.cpp
	retrace/CMakeLists.txt
	retrace/glretrace.hpp
	retrace/glretrace_egl.cpp
	retrace/glretrace_main.cpp
	retrace/glretrace_ws.cpp
	retrace/glws.hpp
	retrace/glws_cocoa.mm
	retrace/glws_egl_xlib.cpp
	retrace/glws_glx.cpp
	retrace/glws_wgl.cpp
	wrappers/egltrace.py
	wrappers/gltrace.hpp
	wrappers/gltrace.py