Provide default figure canvas for inline backend needed due to matplotlib

change.

Conflicts:

	IPython/zmq/pylab/backend_inline.py

IPython/zmq/pylab/backend_inline.py

@@ -10,7 +10,7 b' import sys'
 
 # Third-party imports
 import matplotlib
-from matplotlib.backends.backend_agg import new_figure_manager
+from matplotlib.backends.backend_agg import new_figure_manager, FigureCanvasAgg
 from matplotlib._pylab_helpers import Gcf
 
 # Local imports.
@@ -207,3 +207,6 b' def flush_figures():'
         show._to_draw = []
         show._draw_called = False
 
+
+FigureCanvas = FigureCanvasAgg
+