Merge branch '4.2.1'

Merge pull request IQSS#2601 from IQSS/4.2

Merge 4.2 to master

Merge branch '4.0.2' will be tagged as 4.1 per IQSS#2348

Merge branch '4.0.1'

tagging master as 4.0