Minor refinement for tox part
Merge branch 'master' into gh-pages