Fix bug 981584
Merge pull request #3169 from pmorie/bugs/981584

Merged by openshift-bot