Fix for bug 1047957
Merge pull request #4417 from abhgupta/bug_1047957

Merged by openshift-bot