typo
resync with pyzmq and tornado changes