Merge pull request #262 from bhariharan/unstable20

Point to the right submodule commit
Update shared repo commit
Merge pull request #263 from bhariharan/master

Update shared repo commit
Merge branch 'master' into unstable20