Merge "Use the master constraint again in tox.ini"