Fix for bug 924651
Merge pull request #1767 from abhgupta/abhgupta-dev

Merged by openshift-bot