Fix for bug 959178
Merge pull request #2348 from abhgupta/bug_959178

Merged by openshift-bot