bug fix #2760

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
Merge pull request #795 from smita786/QA_4_1

bug fix #2760
Code cleanup

Signed-off-by: Marc Delisle <marc@infomarc.info>
ChangeLog entry for fix of bug #2760

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