Merge branch 'master' into opengl-es-v2

Conflicts:
	src/mesa/main/dd.h