#4272 Contest-4

Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
Merge pull request #902 from vpowerrc/bug-#4272

#4272 Contest-4
ChangeLog entry for fix of bug #4272

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge commit '1156b57'
Merge commit '65a56a8'
Merge branch 'QA_4_1'