Fix bug 957461
Merge pull request #2572 from pmorie/bugs/957461

Merged by openshift-bot