bug fix 4334

Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
ChangeLog entry

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge commit '67d548f'
Merge pull request #1084 from sampathLiyanage/bugfix4334

bug fix 4334
Merge commit '704e873'
Merge branch 'QA_4_1'