Fix for bug 1012138
Merge pull request #3708 from abhgupta/abhgupta-dev

Merged by openshift-bot