Bug 1141922
Merge pull request #5848 from lnader/master

Merged by openshift-bot