merged to latest czmq

review please