Merge pull request #836 from claco/v4.2.2rc

Update submodule