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