Fix for bug 1025218
Merge pull request #4064 from abhgupta/abhgupta-dev

Merged by openshift-bot