Update tox.ini
Merge remote-tracking branch 'upstream/master' into staging