Merge branch 'master' into easykafka
Merge branch 'easykafka' of https://github.com/wizzat/kafka-python into easykafka