new start
Merge remote-tracking branch 'origin/3.7' into 3.7

Conflicts:
	driver-opencl.c