bug fix 4271

Signed-off-by: A V Minhaz <minhazav@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
ChangeLog entry for bug #4271

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