Merge branch 'pytest-xdist-logging' into 'master'

logging: exits if both verbose logging and xdist are on

See merge request !144
10 jobs for master
in 1 minute and 23 seconds and was queued for 1 second