Merge remote-tracking branch 'upstream/jb-mr1' into jb

	modified:   products/grouper.mk