Re-add _merge to un-break spyder temporarily.#963

Carreau wants to merge 1 commit into

ipython:mainipython/traitlets:mainfrom

Carreau:_merge-readdCarreau/traitlets:_merge-readdCopy head branch name to clipboard