mid cmd 08
Merge remote-tracking branch 'origin/1.9.0' into 1.9.0

Conflicts:
	src/main/resources/grouper.xml