Merge commit 'd4f754c' into QA_4_2
Fix merge conflicts

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

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge commit 'aea604f'
Merge branch 'QA_4_2'