Merge pull request #623 from bhariharan/master

Removing TokenRevocationReceiver across the board
Bugfix around consume()