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

Merged automatically by jenkins after successful build test