Merge branch 'tox-ini-fix' into 'master'