Backport PR #9410 on branch v2.1.x#9411

dstansby merged 1 commit intov2.1.xmatplotlib/matplotlib:v2.1.xfrom

auto-backport-of-pr-9410matplotlib/matplotlib:auto-backport-of-pr-9410Copy head branch name to clipboard