Latest shared repo commit
Merge pull request #663 from bhariharan/master

Latest shared repo commit
Merge branch 'master' into unstable
Merge pull request #664 from bhariharan/unstable

Merge 'master' into unstable