Merged switch-to-zmq branch to trunk