Merge pull request #684 from bhariharan/unstable

Merge branch 'master' into unstable
Latest shared submodule commit
Merge pull request #685 from bhariharan/master

Latest shared submodule commit
Merge branch 'master' into unstable