Merge pull request #546 from hintjens/master

Throughput perf test was borked, fixed it
Merge pull request #547 from hintjens/master

Fixed issue LIBZMQ-525
Fix for LIBZMQ-526