MAINT: manually merge the ipython directive change