bug fix 4285

Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
Merge pull request #933 from sampathLiyanage/bugfix4285

bug fix 4285
Changelog entry

Signed-off-by: Michal Čihař <michal@cihar.com>
Merge remote-tracking branch 'origin/QA_4_1'