Merge pull request #583 from bhariharan/unstable

Merge 'master' into unstable
Bug fix for duplicate AccountWatcher callbacks
Add break
Merge pull request #584 from bhariharan/master

Bug fix for duplicate AccountWatcher callbacks
Patch Release 2.2.1
Merge pull request #585 from bhariharan/master

Patch Release 2.2.1
Merge branch 'master' into unstable