Fix bug 951405
Merge pull request #2357 from pmorie/bugs/951405

Merged by openshift-bot