Point to the latest shared repo commit
Merge pull request #268 from bhariharan/master

Point to the latest shared repo commit
Merge branch 'master' into unstable20
Merge pull request #269 from bhariharan/unstable20

Merge 'master' into unstable20