A missed line from the merge.
Some Epydoc->Sphinx stuff that came from the merge