Merge pull request #859 from claco/v4.1.5rc

Update submodules