Merge pull request #683 from bhariharan/master

Latest shared repo commit
Latest shared submodule commit