flume commit
Merge branch 'master' of https://github.com/alesabater/flume

THIS IS A MERGE