Merge remote-tracking branch 'laurentb/dev-python/pytest-xdist'