Sphinx 2.0.x tweaks.