back to development
object_info_reply field is oname, not name
Merge pull request #6761 from takluyver/oir_oname_2.x

object_info_reply field is oname, not name
install local mathjax on travis (2.x)

weird CDN things are happening on Travis
backport nbformat v4 to 2.x
enable reading v4 notebooks

- add v4 to reader
- validation is not backported
- update some tests to reflect this
- test opening v4 notebooks
Set orig_nbformat keys when downgrading v4->v3
don't write orig_nbformat to disk in v3
don't assume converted notebooks are old

in notebook.js dialogs, which can now be triggered
by nbformat 4 from the future.
Merge pull request #6778 from minrk/2.x-nbformat-4

backport nbformat v4 to 2.x
Backport PR #5458: Add support for PyQt5.

This PR adds the new `QT_API_PYQT5` to `IPython/external/qt_loaders.py ` and allows to embed the IPython console in Qt5 Applications. In case of PyQt5, the loader returns a union of `PyQt5.QtGui` and `PyQt5.QtWidgets` acting as a Qt4-QtGui compatibility module.

One small fix to `InProcessChannel.__init__` was necessary though. For some reason, when constructing `QtInProcessShellChannel`, the `QtCore.QObject.__init__` initializer from `SuperQObject` indirectly calls the `InProcessChannel.__init__` function, which doesn't have a default constructor and thus fails. I assume this has something to do with the metaclass/multiple inheritance approach IPython uses on QObject. Adding a default value for `client` in `InProcessChannel.__init__` solved the problem for me.
Merge branch '2.x' of github.com:ipython/ipython into 2.x-backports