Merged zmq-3.2.2 to trunk