super hacky fix to issue #1310#1659

tacaswell wants to merge 2 commits intomatplotlib:mastermatplotlib/matplotlib:masterfrom

tacaswell:issue_1310_fixtacaswell/matplotlib:issue_1310_fixCopy head branch name to clipboard