merged to latest zeromq