Fix for bug 959976
Merge pull request #2621 from abhgupta/abhgupta-dev

Merged by openshift-bot