Merge branch 'v7-stable' into v8-stable

Conflicts:
	tools/ompipe.c
Merge branch 'v8-stable'