Auto backport of pr 17564 on v3.2.x#17655

tacaswell merged 2 commits intomatplotlib:v3.2.xmatplotlib/matplotlib:v3.2.xfrom

tacaswell:auto-backport-of-pr-17564-on-v3.2.xtacaswell/matplotlib:auto-backport-of-pr-17564-on-v3.2.xCopy head branch name to clipboard