Fix for bug 1040673
Merge pull request #4418 from abhgupta/bug_1040673

Merged by openshift-bot