Let _pcolorargs handle the shape of C, checking compatibility with X and Y
Merge remote-tracking branch 'upstream/v1.2.x'
Fix error in test_pre_transform_plotting.

This error was revealed by the new checking in _pcolorargs.
Add comment and test for _pcolorargs
pgf: add mixed mode rendering
fixes on MixedModeRenderer for non-72dpi figures
mlab.FIFOBuffer: remove fossil line referring to nonexistent method
[DOC] Mathtext and matshow examples
Merge pull request #1975 from pwuertz/pgf_mixedrenderer

MixedModeRenderer non-72-dpi fixes & Pgf mixed rendering
BUG: pass kwargs to TimedAnimation
Added the from_levels_and_colors function.
Merge pull request #2065 from efiring/FIFOBuffer_bug

mlab.FIFOBuffer: remove fossil line referring to nonexistent method
Add shape information to error message
Merge branch 'pcolorargs'
Merge pull request #2069 from jakevdp/anim_fix

BUG: pass kwargs to TimedAnimation
Merge pull request #2069 from jakevdp/anim_fix

BUG: pass kwargs to TimedAnimation
Merge branch 'pcolorargs'
Merge pull request #1975 from pwuertz/pgf_mixedrenderer

MixedModeRenderer non-72-dpi fixes & Pgf mixed rendering
Fix up error message about GObject introspection bindings
Merge pull request #1813 from mdboom/gtk3-version-check

GTK segfault with GTK3 and mpl_toolkits