Merge pull request #354 from cekoski/master

Fix a build issue when building against libzmq master