Update to latest shared commit
Merge pull request #286 from bhariharan/unstable20

Update to latest shared commit