Bugfix for leaking BroadcastReceiver
Merge pull request #674 from bhariharan/unstable

Bugfix for leaking BroadcastReceiver