Remove a stray dependency in tox tests
Merge branch 'develop' into test-coverage