Fixed bug 4154

Signed-off-by: lakshit <lakshitarora26@gmail.com>
ChangeLog entry for fix of bug #4154

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