d224338aa1
This is done primarily to get a docs build fix merged via another tree so that "make htmldocs" stops failing.