Fix bug 1028389
Merge pull request #4184 from pmorie/bugs/1028389

Merged by openshift-bot