merge latest ffi-rzmq into tasboa branch