matplotlib/matplotlib — pull request #2818 by bwkeller (2014-02-16 22:19:56+00:00)
Title: BUGFIX:  This change fixes #2475, and incorporates pull request #2806

I think this should handle both the changes from milli's #2806 pull request and my #2809 pull request.