Contest-2 / Bug #4081

Signed-off-by: Vasu Bhardwaj <voodoorapter014@gmail.com>
Merge pull request #927 from Vasu014/bug4081

Contest-2 / Bug #4081
ChangeLog entry for fix of bug #4081

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