Merge pull request #589 from bhariharan/unstable

Merge branch 'master' into unstable
Adding true support for multi user scenarios in the managers and making it more robust