Latest shared repo commit
Merge pull request #320 from bhariharan/unstable20

Latest shared repo commit
Merge from upstream