Merge "Update tox.ini"