Bugfix around consume()
Merge pull request #627 from bhariharan/master

Bugfix around consume()
Merge branch 'master' into unstable
Merge pull request #628 from bhariharan/unstable

Merge branch 'master' into unstable