Matplotlib v1.3 support.
Actions based on @esc24's review.