Bug 1088247
Merge pull request #5369 from lnader/bugs

Merged by openshift-bot