Merge branch 'master' of https://github.com/zeromq/zeromq4-x
Merge branch 'master' of https://github.com/mditzel/zeromq4-x