Latest shared
Merge pull request #582 from bhariharan/master

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

Merge 'master' into unstable