Fix for bug 967426
Merge pull request #2664 from abhgupta/bug_967426

Merged by openshift-bot