Bug 1032436
Merge pull request #4239 from lnader/bugs

Merged by openshift-bot