Merge "Adopt new docs/tox API"