Merge pull request
#11296 from meeseeksmachine/auto-backport-of-pr-10974-on-6.x...
Merge pull request
#11296 from meeseeksmachine/auto-backport-of-pr-10974-on-6.x
Backport PR
#10974 on branch 6.x (IPython breaks import matplotlib.pyplot when there is no display)