Merge pull request #694 from mfournier/kafka_missing_ifdef