Merge "tox miniversion update to 3.1.1"