Fix for bug 966750
Merge pull request #2662 from abhgupta/abhgupta-dev

Merged by openshift-bot