Backport #5452#5459

Merged

tacaswell merged 2 commits intomatplotlib:v1.5.xfrom

WeatherGod:backport_5452

Nov 11, 2015

Commits on Nov 10, 2015

Merge pull request #5452 from u55/cycler_generic_iterator
WeatherGod
committed
Converted context-based tests to non-context-based tests for the v1.5.x branch
WeatherGod
committed