Fix bug 965490
Merge pull request #2681 from pmorie/bugs/965490

Merged by openshift-bot