Fix BZ891831
Merge pull request #1126 from pmorie/bugs/891831

Merged by openshift-bot