FIX: unbreak master after 2.x merge#6456

tacaswell merged 1 commit intomatplotlib:mastermatplotlib/matplotlib:masterfrom

tacaswell:fix_unbreak_mastertacaswell/matplotlib:fix_unbreak_masterCopy head branch name to clipboard