Fix bug 957262
Merge pull request #2345 from pmorie/bugs/957262

Merged by openshift-bot