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