@@ -33,7 +33,7 @@ install:
   - |
     if [[ $BUILD_DOCS == true ]]; then
       sudo apt-get install -qq --no-install-recommends dvipng texlive-latex-base texlive-latex-extra texlive-fonts-recommended graphviz
-      pip install numpydoc linkchecker
+      pip install numpydoc linkchecker ipython
       wget http://mirrors.kernel.org/ubuntu/pool/universe/f/fonts-humor-sans/fonts-humor-sans_1.0-1_all.deb
       sudo dpkg -i fonts-humor-sans_1.0-1_all.deb
       wget https://googlefontdirectory.googlecode.com/hg/ofl/felipa/Felipa-Regular.ttf
@@ -89,4 +89,4 @@ after_success:
     git push --set-upstream origin gh-pages --force
   else
     echo "Will only deploy docs build from matplotlib master branch"
-  fi
+  fi
@@ -20,3 +20,13 @@ Removed functions with ambiguous argument order from finance.py
 Annotation
 ----------
 Removed ``textcoords`` and ``xytext`` proprieties from Annotation objects.
+
+
+spinxext.ipython_*.py
+---------------------
+Both ``ipython_console_highlighting`` and ``ipython_directive`` have been moved to
+`IPython`.
+
+Change your import from 'matplotlib.sphinxext.ipython_directive' to
+'IPython.sphinxext.ipython_directive' and from 'matplotlib.sphinxext.ipython_directive' to
+'IPython.sphinxext.ipython_directive'