Fix bug 981273
Merge pull request #3019 from pmorie/bugs/981273

Merged by openshift-bot