Merge pull request #977 from claco/master

Update submodules