Merge branch 'master' of ssh://seberle@git.eclipse.org/gitroot/sphinx/org.eclipse.sphinx.git