Follow API changes from IPython development branch