Merge "Switch back the tox constraint to master"