Create a branch for the merge, so it's easier to do local testing without having to constantly revert out of master.
Create a branch for the merge, so it's easier to do local testing
without having to constantly revert out of master.

ipython/ipython,ipython/ipython