Updated for autogeneration of rst docs