Fix for Bug#4275

Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
Merge pull request #916 from dhananjay92/Bug#4275

Fix for Bug#4275
ChangeLog entry for fix of bug #4275

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge commit '52084d8'
Merge commit '37dc085'
Merge branch 'QA_4_1'
Fix coding style

Signed-off-by: Marc Delisle <marc@infomarc.info>