Merge "Update to latest tox"