a couple of changes related to the autodoc extension

Created originally on Bitbucket by dhellmann (Doug Hellmann)

Changesets for this Pull Request have not been imported, because it had been already declined on Bitbucket. Marked as closed by the import user.