Merge branch 'ipython' into 'master'