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

Merged automatically by jenkins after successful build test