Fix for bug 1024669
Merge pull request #4054 from abhgupta/abhgupta-dev

Merged by openshift-bot