Fix for bug 1052395
Merge pull request #4480 from abhgupta/bug_1052395

Merged by openshift-bot