Fix for bug 997008
Merge pull request #3457 from abhgupta/bug_997008

Merged by openshift-bot