Backport PR #11532 on branch v2.2.2-doc#11536

dstansby merged 2 commits intov2.2.2-docmatplotlib/matplotlib:v2.2.2-docfrom

auto-backport-of-pr-11532-on-v2.2.2-docmatplotlib/matplotlib:auto-backport-of-pr-11532-on-v2.2.2-docCopy head branch name to clipboard