Merge branch 'pytest-vars' into 'master'

Rename nosetests specific mark expression to be more...

See merge request !195