Bug 1078119
Merge pull request #5070 from lnader/master

Merged by openshift-bot