Merge pull request #742 from claco/v4.2.1rc

Update submodules