Backport PR #13908 on branch v3.1.x (Enh control tick deconflict2)#13956

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

meeseeksmachine:auto-backport-of-pr-13908-on-v3.1.xmeeseeksmachine/matplotlib:auto-backport-of-pr-13908-on-v3.1.xCopy head branch name to clipboard