Merge latest from zeromq:master.