Merge pull request #254 from bhariharan/unstable

Merge branch 'master' into unstable
Update shared commit
Merge pull request #259 from bhariharan/master

Update shared commit
Merge branch 'master' into unstable