Merge pull request #581 from bhariharan/unstable

Merge branch 'master' into unstable
Latest shared
Merge pull request #582 from bhariharan/master

Latest shared
Merge branch 'master' into unstable