Merge branch 'master' of ssh://kryall@git.eclipse.org/gitroot/cdt/org.eclipse.cdt.edc.git