Merge "Switch to the master constraint in tox.ini"