Add missing import to ipython.py
Merge branch 'master' into python3