Bug 980928
Merge pull request #3017 from lnader/master

Merged by openshift-bot