Manual backport of pr 17983 on v3.3.x#17990

dstansby merged 2 commits intomatplotlib:v3.3.xmatplotlib/matplotlib:v3.3.xfrom

jklymak:auto-backport-of-pr-17983-on-v3.3.xjklymak/matplotlib:auto-backport-of-pr-17983-on-v3.3.xCopy head branch name to clipboard