Fix bug 1042895
Merge pull request #4342 from pmorie/bugs/1042895

Merged by openshift-bot