Backport PR #19108 on branch v3.3.x#19115

tacaswell merged 4 commits into

matplotlib:v3.3.xmatplotlib/matplotlib:v3.3.xfrom

timhoffm:auto-backport-of-pr-19108-on-v3.3.xtimhoffm/matplotlib:auto-backport-of-pr-19108-on-v3.3.xCopy head branch name to clipboard