Bug 965804
Merge pull request #2875 from lnader/master

Merged by openshift-bot