Fix bug 1028257
Merge pull request #4132 from pmorie/bugs/1028257

Merged by openshift-bot