[4.6] Backport #5389#5401

asottile merged 1 commit intopytest-dev:4.6-maintenancepytest-dev/pytest:4.6-maintenancefrom

nicoddemus:backport-5389nicoddemus/pytest:backport-5389Copy head branch name to clipboard