push from sphinx trunk