Backport PR #8690 on branch v3.1.x#13709

QuLogic merged 1 commit intomatplotlib:v3.1.xmatplotlib/matplotlib:v3.1.xfrom

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