Fix merge conflict

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