pull upstream changes to zmq.ssh from IPython