ENH: merge in changes for generated docs
5 files changed