Merge branch 'master' of ssh://lkirchev@git.eclipse.org/gitroot/equinox/rt.equinox.incubator