Merge branch 'master' of ssh://git.eclipse.org/gitroot/orion/org.eclipse.orion.client