Some tox_wait_* improvements
Merge pull request #790 from nurupo/tox-wait-fix

Some tox_wait_* improvements