Sphinx conf cleanup
Merge from master