Fix for bug 1049064
Merge pull request #4479 from abhgupta/bug_1049064

Merged by openshift-bot