4.2.6-dev

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

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