Update shared repo commit
Merge pull request #263 from bhariharan/master

Update shared repo commit
Merge branch 'master' into unstable20
Merge pull request #264 from bhariharan/unstable20

Merge 'master' into unstable20