Support for `python setup.py test` to run the tox suite.
Merge remote-tracking branch 'origin/master'