Merge branch 'master' into generic

Conflicts:
	releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target


Change-Id: I41c8b1921fbe39400be8ace4dea364c0cada1088
Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>