Merge branch 'wip' into gles3

Conflicts:
	src/mesa/drivers/dri/intel/intel_screen.c