Merge pull request #14915 from AWhetter/fix_14585#14987

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

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