Compatibility with IPython 7#23

cc-a wants to merge 4 commits intoipython:masteripython/rlipython:masterfrom

cc-a:ipython_7_compatibilitycc-a/rlipython:ipython_7_compatibilityCopy head branch name to clipboard