Merge from zeromq/master