Fix for BZ 891431.
Merge pull request #1112 from mrunalp/bugs/891431

Merged by openshift-bot