Bugfix4301

Signed-off-by: Krtin Kumar <krtinkumar@gmail.com>
ChangeLog entry

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge pull request #1020 from krtin/Bug_FIX#4301

Bugfix4301
Merge commit '32edccc'
Merge commit 'e8be063'
Merge branch 'QA_4_1'