4.2.0 release

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge branch 'MAINT_4_2_0' into QA_4_2
4.2.0 release

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge commit '61d014a'
4.2.0 release

Signed-off-by: Marc Delisle <marc@infomarc.info>