Merge pull request #14915 from AWhetter/fix_14585#14986

tacaswell merged 1 commit intomatplotlib:v2.2.xmatplotlib/matplotlib:v2.2.xfrom

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