merged to latest zeromq3