Merge pull request #2086 from thess/zmq-update