Fix bug 918823
Merge pull request #1716 from pmorie/bugs/918823

Merged by openshift-bot