Updated to work with libzmq 3.3.0.
Merge branch 'dev'