Merge branch 'master' of ssh://slewis@git.eclipse.org:29418/ecf/org.eclipse.ecf.git