Code

Merge pull request #1774 from mmckinst/rdkafka_now_libkafka