Fix for bug 1014837
Merge pull request #3768 from abhgupta/abhgupta-dev

Merged by openshift-bot