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

Update submodules