Fix for bug 977224
Merge pull request #2944 from abhgupta/abhgupta-dev

Merged by openshift-bot